From 029781b5173a05feda328f7344e2745c3f30effb Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Mon, 2 Mar 2026 12:14:04 +0000
Subject: [PATCH 1/7] perf: reduce source-gen JIT overhead via metadata factory
 helpers

Replace inline TestMetadata<T> and MethodMetadata object initializers
(~38 lines each) in generated code with calls to shared factory methods
TestMetadataFactory.Create<T>() and MethodMetadataFactory.Create().

A generic factory method Create<T>() where T : class gets JIT'd once
by the .NET runtime (reference types share native code), so replacing
per-class inline initializers with calls to a shared factory dramatically
reduces JIT-compiled native code size.

Benchmark (10,000 tests, net10.0):
- Cold start: 5.42s -> 4.26s (21% faster)
- Warm runs:  3.30s -> 2.64s (20% faster)
- Gap to reflection mode cut in half (1.3s -> 0.64s)

Also folds UseRuntimeDataGeneration(testSessionId) into the factory
method as an optional parameter, eliminating a separate call per test.
---
 Library.props                                 |    4 +
 .../AbstractTests.Concrete2.verified.txt      |  116 +-
 .../AfterAllTests.Test.verified.txt           |  220 +-
 .../AfterTests.Test.verified.txt              |  220 +-
 .../ArgsAsArrayTests.Test.verified.txt        |  498 ++--
 ...thImplicitConverterTests.Test.verified.txt |  334 +--
 ...lyLoaderTests.Test.DotNet10_0.verified.txt |  322 +--
 ...blyLoaderTests.Test.DotNet8_0.verified.txt |  322 +--
 ...blyLoaderTests.Test.DotNet9_0.verified.txt |  322 +--
 ...semblyLoaderTests.Test.Net4_7.verified.txt |  322 +--
 ...hodDataSourceDrivenTests.Test.verified.txt | 1442 ++++------
 .../AttributeTests.Test.verified.txt          |  116 +-
 .../BasicTests.Test.DotNet10_0.verified.txt   |  322 +--
 .../BasicTests.Test.DotNet8_0.verified.txt    |  322 +--
 .../BasicTests.Test.DotNet9_0.verified.txt    |  322 +--
 .../BasicTests.Test.Net4_7.verified.txt       |  322 +--
 .../BeforeAllTests.Test.verified.txt          |  220 +-
 .../BeforeTests.Test.verified.txt             |  220 +-
 ...lableTypeTest.Test.DotNet10_0.verified.txt |  114 +-
 ...llableTypeTest.Test.DotNet8_0.verified.txt |  114 +-
 ...llableTypeTest.Test.DotNet9_0.verified.txt |  114 +-
 ...1NullableTypeTest.Test.Net4_7.verified.txt |  114 +-
 ...sAndMethodArgumentsTests.Test.verified.txt |  572 ++--
 .../ClassConstructorTest.Test.verified.txt    |  204 +-
 ...assDataSourceDrivenTests.Test.verified.txt | 1372 ++++------
 ...ssDataSourceDrivenTests2.Test.verified.txt |  317 +--
 ...ceDrivenTestsSharedKeyed.Test.verified.txt |  318 +--
 ...pleDataSourceDrivenTests.Test.verified.txt |  966 +++----
 .../ConcreteClassTests.Test.verified.txt      |  116 +-
 ...nflictingNamespace.DotNet10_0.verified.txt |  322 +--
 ...onflictingNamespace.DotNet8_0.verified.txt |  322 +--
 ...onflictingNamespace.DotNet9_0.verified.txt |  322 +--
 ...thConflictingNamespace.Net4_7.verified.txt |  322 +--
 ...nflictingNamespace.DotNet10_0.verified.txt | 1612 ++++-------
 ...onflictingNamespace.DotNet8_0.verified.txt | 1612 ++++-------
 ...onflictingNamespace.DotNet9_0.verified.txt | 1612 ++++-------
 ...thConflictingNamespace.Net4_7.verified.txt | 1612 ++++-------
 ...nflictingNamespace.DotNet10_0.verified.txt | 2378 ++++++----------
 ...onflictingNamespace.DotNet8_0.verified.txt | 2378 ++++++----------
 ...onflictingNamespace.DotNet9_0.verified.txt | 2378 ++++++----------
 ...thConflictingNamespace.Net4_7.verified.txt | 2378 ++++++----------
 ...nflictingNamespace.DotNet10_0.verified.txt | 1470 ++++------
 ...onflictingNamespace.DotNet8_0.verified.txt | 1470 ++++------
 ...onflictingNamespace.DotNet9_0.verified.txt | 1470 ++++------
 ...thConflictingNamespace.Net4_7.verified.txt | 1470 ++++------
 ...nflictingNamespace.DotNet10_0.verified.txt |  248 +-
 ...onflictingNamespace.DotNet8_0.verified.txt |  248 +-
 ...onflictingNamespace.DotNet9_0.verified.txt |  248 +-
 ...thConflictingNamespace.Net4_7.verified.txt |  248 +-
 .../ConstantArgumentsTests.Test.verified.txt  | 1092 +++-----
 ...ConstantInBaseClassTests.Test.verified.txt |  166 +-
 ...InterpolatedStringsTests.Test.verified.txt |  166 +-
 .../CustomDisplayNameTests.Test.verified.txt  | 1636 ++++-------
 .../DataDrivenTests.Test.verified.txt         | 1614 ++++-------
 ...ithDataSourceMethodTests.Test.verified.txt |  428 ++-
 ...ataSourceGeneratorTests.Typed.verified.txt |  866 +++---
 ...aSourceGeneratorTests.Untyped.verified.txt |  250 +-
 .../DecimalArgumentTests.Test.verified.txt    | 2108 ++++++---------
 ...nScannerTests.Test.DotNet10_0.verified.txt |  322 +--
 ...onScannerTests.Test.DotNet8_0.verified.txt |  322 +--
 ...onScannerTests.Test.DotNet9_0.verified.txt |  322 +--
 ...ctionScannerTests.Test.Net4_7.verified.txt |  322 +--
 .../EnumMemberNamesTests.Test.verified.txt    |  174 +-
 ...bleDataSourceDrivenTests.Test.verified.txt |  614 ++---
 ...pleDataSourceDrivenTests.Test.verified.txt |  334 +--
 ...xpectedArgumentTypeTests.Test.verified.txt |  478 ++--
 ...cRegistry_WhenNoGenericsFound.verified.txt |  116 +-
 .../Hooks1589.Test.verified.txt               |  166 +-
 .../Hooks1594.Test.verified.txt               |  166 +-
 ...ritedPropertySetterTests.Test.verified.txt |  842 +++---
 ...romDifferentProjectTests.Test.verified.txt |  552 ++--
 ...heritsTestsAbstractTests.Test.verified.txt |  116 +-
 .../InheritsTestsTests.Test.verified.txt      |  294 +-
 .../Issue2887Tests.Test.verified.txt          |  152 +-
 .../MatrixTests.Test.verified.txt             | 2380 ++++++-----------
 ...hodDataSourceDrivenTests.Test.verified.txt | 1472 ++++------
 ...thCancellationTokenTests.Test.verified.txt |  510 ++--
 ...assDataSourceDrivenTests.Test.verified.txt |  505 ++--
 .../NameOfArgumentTests.Test.verified.txt     |  166 +-
 ...ullableByteArgumentTests.Test.verified.txt |  354 +--
 .../NumberArgumentTests.Test.verified.txt     |  936 +++----
 .../NumberArgumentTests.TestDE.verified.txt   |  936 +++----
 .../PriorityFilteringTests.Test.verified.txt  |  636 ++---
 .../PropertySetterTests.Test.verified.txt     |  842 +++---
 ...atTests.Assembly_Level_Repeat.verified.txt |  228 +-
 .../RepeatTests.Test.verified.txt             |  336 +--
 ...TAThreadTests.Test.DotNet10_0.verified.txt | 1632 +++--------
 ...STAThreadTests.Test.DotNet8_0.verified.txt | 1632 +++--------
 ...STAThreadTests.Test.DotNet9_0.verified.txt | 1632 +++--------
 .../STAThreadTests.Test.Net4_7.verified.txt   | 1632 +++--------
 .../StringArgumentTests.Test.verified.txt     |  374 +--
 .../Tests.Test.verified.txt                   |  534 ++--
 .../Tests1538.Test.verified.txt               | 1032 ++++---
 .../Tests1539.Test.verified.txt               |  116 +-
 .../Tests1589.Test.verified.txt               |  166 +-
 .../Tests1594.Test.verified.txt               |  166 +-
 .../Tests1603.Test.verified.txt               |  318 +--
 .../Tests1692.Test.verified.txt               |  170 +-
 .../Tests1821.Test.verified.txt               |  409 ++-
 .../Tests2083.Test.verified.txt               |  186 +-
 .../Tests2085.Test.verified.txt               |  318 +--
 .../Tests2112.Test.verified.txt               |  382 +--
 ...utCancellationTokenTests.Test.verified.txt | 2055 ++++++--------
 ...pleDataSourceDrivenTests.Test.verified.txt |  250 +-
 ...st_AotSafeDataSourceFactories.verified.txt |  226 +-
 ...sts.Test_ConfigurationSupport.verified.txt |  116 +-
 ..._ModuleInitializer_Generation.verified.txt |  116 +-
 ...nglyTypedDelegates_Generation.verified.txt |  116 +-
 .../Generators/TestMetadataGenerator.cs       |  416 ++-
 .../Models/ClassTestGroup.cs                  |    6 +
 .../Utilities/MetadataGenerationHelper.cs     |   27 +
 TUnit.Core/MethodMetadataFactory.cs           |   34 +
 TUnit.Core/TestMetadataFactory.cs             |   57 +
 ...Has_No_API_Changes.DotNet10_0.verified.txt |   28 +
 ..._Has_No_API_Changes.DotNet8_0.verified.txt |   28 +
 ..._Has_No_API_Changes.DotNet9_0.verified.txt |   28 +
 ...ary_Has_No_API_Changes.Net4_7.verified.txt |   25 +
 117 files changed, 25626 insertions(+), 45927 deletions(-)
 create mode 100644 TUnit.Core/MethodMetadataFactory.cs
 create mode 100644 TUnit.Core/TestMetadataFactory.cs

diff --git a/Library.props b/Library.props
index a4f9a83316..72689137dc 100644
--- a/Library.props
+++ b/Library.props
@@ -6,6 +6,10 @@
 
         <TrimmerSingleWarn>false</TrimmerSingleWarn>
 
+        <!-- Suppress AD0001 analyzer crash in .NET 9 ILLink DynamicallyAccessedMembersAnalyzer.
+             This is a known .NET 9 SDK analyzer bug, not a code issue. -->
+        <NoWarn Condition="'$(TargetFramework)' == 'net9.0'">$(NoWarn);AD0001</NoWarn>
+
         <IsAotCompatible
             Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsAotCompatible>
 
diff --git a/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt b/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
index d57491ee7e..de8866edfc 100644
--- a/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SecondTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AbstractTests.ConcreteClass2>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SecondTest",
-            TestClassType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-            TestMethodName = "SecondTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                Name = "SecondTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                    Name = "ConcreteClass2",
-                    Namespace = "TUnit.TestProject.AbstractTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SecondTest,
-        };
-        metadata_SecondTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+        Name = "ConcreteClass2",
+        Namespace = "TUnit.TestProject.AbstractTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
+        var metadata_SecondTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
+            "SecondTest", "SecondTest", 11,
+            __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SecondTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -91,45 +71,25 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SecondTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AbstractTests.ConcreteClass2>
-        {
-            TestName = "SecondTest",
-            TestClassType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-            TestMethodName = "SecondTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                Name = "SecondTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                    Name = "ConcreteClass2",
-                    Namespace = "TUnit.TestProject.AbstractTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SecondTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+    Name = "ConcreteClass2",
+    Namespace = "TUnit.TestProject.AbstractTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
+            "SecondTest", "SecondTest", 11,
+            __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AbstractTests.ConcreteClass2 CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
index 43d532d180..923c021e2e 100644
--- a/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,84 +9,32 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AfterTests.CleanupTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                    Name = "CleanupTests",
-                    Namespace = "TUnit.TestProject.AfterTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test2 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AfterTests.CleanupTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                    Name = "CleanupTests",
-                    Namespace = "TUnit.TestProject.AfterTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata_Test2.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+        Name = "CleanupTests",
+        Namespace = "TUnit.TestProject.AfterTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
+            "Test1", "Test1", 98,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
+            "Test2", "Test2", 104,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -153,88 +101,48 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AfterTests.CleanupTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                    Name = "CleanupTests",
-                    Namespace = "TUnit.TestProject.AfterTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+    Name = "CleanupTests",
+    Namespace = "TUnit.TestProject.AfterTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
+            "Test1", "Test1", 98,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AfterTests.CleanupTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                    Name = "CleanupTests",
-                    Namespace = "TUnit.TestProject.AfterTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+    Name = "CleanupTests",
+    Namespace = "TUnit.TestProject.AfterTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
+            "Test2", "Test2", 104,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AfterTests.CleanupTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
index 43d532d180..923c021e2e 100644
--- a/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,84 +9,32 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AfterTests.CleanupTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                    Name = "CleanupTests",
-                    Namespace = "TUnit.TestProject.AfterTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test2 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AfterTests.CleanupTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                    Name = "CleanupTests",
-                    Namespace = "TUnit.TestProject.AfterTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata_Test2.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+        Name = "CleanupTests",
+        Namespace = "TUnit.TestProject.AfterTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
+            "Test1", "Test1", 98,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
+            "Test2", "Test2", 104,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -153,88 +101,48 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AfterTests.CleanupTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                    Name = "CleanupTests",
-                    Namespace = "TUnit.TestProject.AfterTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+    Name = "CleanupTests",
+    Namespace = "TUnit.TestProject.AfterTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
+            "Test1", "Test1", 98,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AfterTests.CleanupTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-                    Name = "CleanupTests",
-                    Namespace = "TUnit.TestProject.AfterTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+    Name = "CleanupTests",
+    Namespace = "TUnit.TestProject.AfterTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
+            "Test2", "Test2", 104,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AfterTests.CleanupTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
index ce66344069..aef01e66b1 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,166 +9,85 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Params__string__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgsAsArrayTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Params",
-            TestClassType = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-            TestMethodName = "Params",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                Name = "Params",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
-                    {
-                        Name = "arguments",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                    Name = "ArgsAsArrayTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Params__string__,
-        };
-        metadata_Params__string__.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ParamsEnumerable__IEnumerable_string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgsAsArrayTests>
+        Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+        Name = "ArgsAsArrayTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
+        var metadata_Params__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
+            "Params", "Params", 5,
+            __InvokeTest_Params__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Params", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "ParamsEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-            TestMethodName = "ParamsEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                Name = "ParamsEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Collections.Generic.IEnumerable<string>))
-                    {
-                        Name = "arguments",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Collections.Generic.IEnumerable<string>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("ParamsEnumerable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                    Name = "ArgsAsArrayTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ParamsEnumerable__IEnumerable_string_,
-        };
-        metadata_ParamsEnumerable__IEnumerable_string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Following_Non_Params__int_IEnumerable_string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgsAsArrayTests>
+        new global::TUnit.Core.ParameterMetadata(typeof(string[]))
         {
-            TestName = "Following_Non_Params",
-            TestClassType = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-            TestMethodName = "Following_Non_Params",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "arg1", "arg2", "arg3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 25,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                Name = "Following_Non_Params",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Following_Non_Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Collections.Generic.IEnumerable<string>))
-                    {
-                        Name = "arguments",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Collections.Generic.IEnumerable<string>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Following_Non_Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                    Name = "ArgsAsArrayTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Following_Non_Params__int_IEnumerable_string_,
-        };
-        metadata_Following_Non_Params__int_IEnumerable_string_.UseRuntimeDataGeneration(testSessionId);
+        Name = "arguments",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ParamsEnumerable__IEnumerable_string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
+            "ParamsEnumerable", "ParamsEnumerable", 15,
+            __InvokeTest_ParamsEnumerable__IEnumerable_string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ParamsEnumerable", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Collections.Generic.IEnumerable<string>))
+        {
+        Name = "arguments",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Collections.Generic.IEnumerable<string>)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("ParamsEnumerable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Following_Non_Params__int_IEnumerable_string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
+            "Following_Non_Params", "Following_Non_Params", 25,
+            __InvokeTest_Following_Non_Params__int_IEnumerable_string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Following_Non_Params", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Following_Non_Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Collections.Generic.IEnumerable<string>))
+        {
+        Name = "arguments",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Collections.Generic.IEnumerable<string>)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Following_Non_Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1, "arg1", "arg2", "arg3"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Params__string__, metadata_ParamsEnumerable__IEnumerable_string_, metadata_Following_Non_Params__int_IEnumerable_string_ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -378,174 +297,117 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Params__string__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgsAsArrayTests>
-        {
-            TestName = "Params",
-            TestClassType = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-            TestMethodName = "Params",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                Name = "Params",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
-                    {
-                        Name = "arguments",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                    Name = "ArgsAsArrayTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Params__string__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+    Name = "ArgsAsArrayTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
+            "Params", "Params", 5,
+            __InvokeTest_Params__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Params", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+    {
+    Name = "arguments",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ParamsEnumerable__IEnumerable_string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgsAsArrayTests>
-        {
-            TestName = "ParamsEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-            TestMethodName = "ParamsEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                Name = "ParamsEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Collections.Generic.IEnumerable<string>))
-                    {
-                        Name = "arguments",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Collections.Generic.IEnumerable<string>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("ParamsEnumerable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                    Name = "ArgsAsArrayTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ParamsEnumerable__IEnumerable_string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+    Name = "ArgsAsArrayTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
+            "ParamsEnumerable", "ParamsEnumerable", 15,
+            __InvokeTest_ParamsEnumerable__IEnumerable_string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ParamsEnumerable", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Collections.Generic.IEnumerable<string>))
+    {
+    Name = "arguments",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Collections.Generic.IEnumerable<string>)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("ParamsEnumerable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Following_Non_Params__int_IEnumerable_string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgsAsArrayTests>
-        {
-            TestName = "Following_Non_Params",
-            TestClassType = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-            TestMethodName = "Following_Non_Params",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "arg1", "arg2", "arg3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 25,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                Name = "Following_Non_Params",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Following_Non_Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Collections.Generic.IEnumerable<string>))
-                    {
-                        Name = "arguments",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Collections.Generic.IEnumerable<string>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Following_Non_Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-                    Name = "ArgsAsArrayTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Following_Non_Params__int_IEnumerable_string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+    Name = "ArgsAsArrayTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
+            "Following_Non_Params", "Following_Non_Params", 25,
+            __InvokeTest_Following_Non_Params__int_IEnumerable_string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Following_Non_Params", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Following_Non_Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Collections.Generic.IEnumerable<string>))
+    {
+    Name = "arguments",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Collections.Generic.IEnumerable<string>)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ArgsAsArrayTests).GetMethod("Following_Non_Params", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Collections.Generic.IEnumerable<string>) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1, "arg1", "arg2", "arg3"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ArgsAsArrayTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
index ea2653e405..d361a4c157 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,112 +9,62 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Explicit__ExplicitInteger = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Explicit",
-            TestClassType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-            TestMethodName = "Explicit",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-                Name = "Explicit",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ExplicitInteger))
-                    {
-                        Name = "integer",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExplicitInteger)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests).GetMethod("Explicit", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.ExplicitInteger) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-                    Name = "ArgumentWithImplicitConverterTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Explicit__ExplicitInteger,
-        };
-        metadata_Explicit__ExplicitInteger.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Implicit__ImplicitInteger = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>
+        Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
+        Name = "ArgumentWithImplicitConverterTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests);
+        var metadata_Explicit__ExplicitInteger = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
+            "Explicit", "Explicit", 8,
+            __InvokeTest_Explicit__ExplicitInteger, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Explicit", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "Implicit",
-            TestClassType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-            TestMethodName = "Implicit",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-                Name = "Implicit",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ImplicitInteger))
-                    {
-                        Name = "integer",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ImplicitInteger)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests).GetMethod("Implicit", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.ImplicitInteger) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-                    Name = "ArgumentWithImplicitConverterTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Implicit__ImplicitInteger,
-        };
-        metadata_Implicit__ImplicitInteger.UseRuntimeDataGeneration(testSessionId);
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ExplicitInteger))
+        {
+        Name = "integer",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExplicitInteger)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests).GetMethod("Explicit", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.ExplicitInteger) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+            new global::TUnit.Core.ArgumentsAttribute(2),
+            new global::TUnit.Core.ArgumentsAttribute(3),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Implicit__ImplicitInteger = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
+            "Implicit", "Implicit", 17,
+            __InvokeTest_Implicit__ImplicitInteger, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Implicit", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ImplicitInteger))
+        {
+        Name = "integer",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ImplicitInteger)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests).GetMethod("Implicit", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.ImplicitInteger) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+            new global::TUnit.Core.ArgumentsAttribute(2),
+            new global::TUnit.Core.ArgumentsAttribute(3),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Explicit__ExplicitInteger, metadata_Implicit__ImplicitInteger };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -200,116 +150,78 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Explicit__ExplicitInteger(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>
-        {
-            TestName = "Explicit",
-            TestClassType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-            TestMethodName = "Explicit",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-                Name = "Explicit",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ExplicitInteger))
-                    {
-                        Name = "integer",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExplicitInteger)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests).GetMethod("Explicit", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.ExplicitInteger) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-                    Name = "ArgumentWithImplicitConverterTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Explicit__ExplicitInteger,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
+    Name = "ArgumentWithImplicitConverterTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
+            "Explicit", "Explicit", 8,
+            __InvokeTest_Explicit__ExplicitInteger, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Explicit", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ExplicitInteger))
+    {
+    Name = "integer",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExplicitInteger)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests).GetMethod("Explicit", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.ExplicitInteger) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+        new global::TUnit.Core.ArgumentsAttribute(2),
+        new global::TUnit.Core.ArgumentsAttribute(3),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Implicit__ImplicitInteger(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>
-        {
-            TestName = "Implicit",
-            TestClassType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-            TestMethodName = "Implicit",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-                Name = "Implicit",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ImplicitInteger))
-                    {
-                        Name = "integer",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ImplicitInteger)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests).GetMethod("Implicit", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.ImplicitInteger) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-                    Name = "ArgumentWithImplicitConverterTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Implicit__ImplicitInteger,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
+    Name = "ArgumentWithImplicitConverterTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
+            "Implicit", "Implicit", 17,
+            __InvokeTest_Implicit__ImplicitInteger, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Implicit", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ImplicitInteger))
+    {
+    Name = "integer",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ImplicitInteger)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests).GetMethod("Implicit", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.ImplicitInteger) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+        new global::TUnit.Core.ArgumentsAttribute(2),
+        new global::TUnit.Core.ArgumentsAttribute(3),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ArgumentWithImplicitConverterTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
index c118dc5b3a..edbb68244a 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
index d05e4214ab..c6e42dfe10 100644
--- a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,517 +9,312 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_AsyncMethodDataSource_SingleValue__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+        Name = "AsyncMethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
+        var metadata_AsyncMethodDataSource_SingleValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_SingleValue", "AsyncMethodDataSource_SingleValue", 8,
+            __InvokeTest_AsyncMethodDataSource_SingleValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_SingleValue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_SingleValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "AsyncMethodDataSource_SingleValue",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_SingleValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethod();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_SingleValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_SingleValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_SingleValue__int,
-        };
-        metadata_AsyncMethodDataSource_SingleValue__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsyncMethodDataSource_Tuples__int_string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsyncMethodDataSource_Tuples__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_Tuples", "AsyncMethodDataSource_Tuples", 15,
+            __InvokeTest_AsyncMethodDataSource_Tuples__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_Tuples", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Tuples", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Tuples", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "AsyncMethodDataSource_Tuples",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_Tuples",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithTuples")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithTuples")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethodWithTuples();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethodWithTuples();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_Tuples",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Tuples", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Tuples", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_Tuples__int_string,
-        };
-        metadata_AsyncMethodDataSource_Tuples__int_string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsyncMethodDataSource_Enumerable__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsyncMethodDataSource_Enumerable__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_Enumerable", "AsyncMethodDataSource_Enumerable", 23,
+            __InvokeTest_AsyncMethodDataSource_Enumerable__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_Enumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Enumerable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "AsyncMethodDataSource_Enumerable",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_Enumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("AsyncEnumerableDataMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncEnumerableDataMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncEnumerableDataMethod();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncEnumerableDataMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_Enumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Enumerable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_Enumerable__int,
-        };
-        metadata_AsyncMethodDataSource_Enumerable__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsyncMethodDataSource_Func__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsyncMethodDataSource_Func__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_Func", "AsyncMethodDataSource_Func", 30,
+            __InvokeTest_AsyncMethodDataSource_Func__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_Func", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Func", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "AsyncMethodDataSource_Func",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_Func",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("AsyncFuncDataMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncFuncDataMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncFuncDataMethod();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncFuncDataMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_Func",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Func", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_Func__int,
-        };
-        metadata_AsyncMethodDataSource_Func__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsyncMethodDataSource_WithArguments__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsyncMethodDataSource_WithArguments__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_WithArguments", "AsyncMethodDataSource_WithArguments", 37,
+            __InvokeTest_AsyncMethodDataSource_WithArguments__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_WithArguments", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_WithArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "AsyncMethodDataSource_WithArguments",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_WithArguments",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithArgs")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithArgs")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethodWithArgs();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethodWithArgs();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 37,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_WithArguments",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_WithArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_WithArguments__int,
-        };
-        metadata_AsyncMethodDataSource_WithArguments__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsyncMethodDataSource_ExternalClass__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsyncMethodDataSource_ExternalClass__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_ExternalClass", "AsyncMethodDataSource_ExternalClass", 44,
+            __InvokeTest_AsyncMethodDataSource_ExternalClass__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_ExternalClass", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_ExternalClass", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "AsyncMethodDataSource_ExternalClass",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_ExternalClass",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.AsyncExternalDataSource), "GetData")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.AsyncExternalDataSource), "GetData")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.AsyncExternalDataSource.GetData();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.AsyncExternalDataSource.GetData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 44,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_ExternalClass",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_ExternalClass", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_ExternalClass__string,
-        };
-        metadata_AsyncMethodDataSource_ExternalClass__string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskMethodDataSource_SingleValue__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskMethodDataSource_SingleValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "ValueTaskMethodDataSource_SingleValue", "ValueTaskMethodDataSource_SingleValue", 51,
+            __InvokeTest_ValueTaskMethodDataSource_SingleValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskMethodDataSource_SingleValue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("ValueTaskMethodDataSource_SingleValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "ValueTaskMethodDataSource_SingleValue",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "ValueTaskMethodDataSource_SingleValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("ValueTaskDataMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("ValueTaskDataMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.ValueTaskDataMethod();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.ValueTaskDataMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 51,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "ValueTaskMethodDataSource_SingleValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("ValueTaskMethodDataSource_SingleValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskMethodDataSource_SingleValue__int,
-        };
-        metadata_ValueTaskMethodDataSource_SingleValue__int.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_AsyncMethodDataSource_SingleValue__int, metadata_AsyncMethodDataSource_Tuples__int_string, metadata_AsyncMethodDataSource_Enumerable__int, metadata_AsyncMethodDataSource_Func__int, metadata_AsyncMethodDataSource_WithArguments__int, metadata_AsyncMethodDataSource_ExternalClass__string, metadata_ValueTaskMethodDataSource_SingleValue__int };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -773,541 +568,408 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_SingleValue__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+    Name = "AsyncMethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_SingleValue", "AsyncMethodDataSource_SingleValue", 8,
+            __InvokeTest_AsyncMethodDataSource_SingleValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_SingleValue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_SingleValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethod")
         {
-            TestName = "AsyncMethodDataSource_SingleValue",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_SingleValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethod();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_SingleValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    else
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_SingleValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_SingleValue__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_Tuples__int_string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+    Name = "AsyncMethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_Tuples", "AsyncMethodDataSource_Tuples", 15,
+            __InvokeTest_AsyncMethodDataSource_Tuples__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_Tuples", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Tuples", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Tuples", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithTuples")
         {
-            TestName = "AsyncMethodDataSource_Tuples",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_Tuples",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithTuples")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethodWithTuples();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethodWithTuples();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_Tuples",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Tuples", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
+                    else
                     {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Tuples", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_Tuples__int_string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_Enumerable__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+    Name = "AsyncMethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_Enumerable", "AsyncMethodDataSource_Enumerable", 23,
+            __InvokeTest_AsyncMethodDataSource_Enumerable__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_Enumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Enumerable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("AsyncEnumerableDataMethod")
         {
-            TestName = "AsyncMethodDataSource_Enumerable",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_Enumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncEnumerableDataMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncEnumerableDataMethod();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncEnumerableDataMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_Enumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    else
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Enumerable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_Enumerable__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_Func__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+    Name = "AsyncMethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_Func", "AsyncMethodDataSource_Func", 30,
+            __InvokeTest_AsyncMethodDataSource_Func__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_Func", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Func", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("AsyncFuncDataMethod")
         {
-            TestName = "AsyncMethodDataSource_Func",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_Func",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncFuncDataMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncFuncDataMethod();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncFuncDataMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_Func",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    else
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_Func", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_Func__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_WithArguments__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+    Name = "AsyncMethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_WithArguments", "AsyncMethodDataSource_WithArguments", 37,
+            __InvokeTest_AsyncMethodDataSource_WithArguments__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_WithArguments", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_WithArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithArgs")
         {
-            TestName = "AsyncMethodDataSource_WithArguments",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_WithArguments",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithArgs")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethodWithArgs();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.AsyncDataMethodWithArgs();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 37,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_WithArguments",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    else
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_WithArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_WithArguments__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_ExternalClass__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+    Name = "AsyncMethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "AsyncMethodDataSource_ExternalClass", "AsyncMethodDataSource_ExternalClass", 44,
+            __InvokeTest_AsyncMethodDataSource_ExternalClass__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsyncMethodDataSource_ExternalClass", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_ExternalClass", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.AsyncExternalDataSource), "GetData")
         {
-            TestName = "AsyncMethodDataSource_ExternalClass",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "AsyncMethodDataSource_ExternalClass",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.AsyncExternalDataSource), "GetData")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.AsyncExternalDataSource.GetData();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.AsyncExternalDataSource.GetData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 44,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "AsyncMethodDataSource_ExternalClass",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
+                    else
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("AsyncMethodDataSource_ExternalClass", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsyncMethodDataSource_ExternalClass__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskMethodDataSource_SingleValue__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+    Name = "AsyncMethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
+            "ValueTaskMethodDataSource_SingleValue", "ValueTaskMethodDataSource_SingleValue", 51,
+            __InvokeTest_ValueTaskMethodDataSource_SingleValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskMethodDataSource_SingleValue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("ValueTaskMethodDataSource_SingleValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("ValueTaskDataMethod")
         {
-            TestName = "ValueTaskMethodDataSource_SingleValue",
-            TestClassType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-            TestMethodName = "ValueTaskMethodDataSource_SingleValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("ValueTaskDataMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.ValueTaskDataMethod();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests.ValueTaskDataMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 51,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                Name = "ValueTaskMethodDataSource_SingleValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    else
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests).GetMethod("ValueTaskMethodDataSource_SingleValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-                    Name = "AsyncMethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskMethodDataSource_SingleValue__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
index 4c17e7c220..89e15f31ea 100644
--- a/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_AttributeTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_MyTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AttributeTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AttributeTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "MyTest",
-            TestClassType = typeof(global::TUnit.TestProject.AttributeTests),
-            TestMethodName = "MyTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AttributeTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
-                Name = "MyTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AttributeTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AttributeTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
-                    Name = "AttributeTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MyTest,
-        };
-        metadata_MyTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.AttributeTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
+        Name = "AttributeTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AttributeTests);
+        var metadata_MyTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AttributeTests>(
+            "MyTest", "MyTest", 7,
+            __InvokeTest_MyTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MyTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_MyTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -101,45 +81,25 @@ internal static class TUnit_TestProject_AttributeTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MyTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AttributeTests>
-        {
-            TestName = "MyTest",
-            TestClassType = typeof(global::TUnit.TestProject.AttributeTests),
-            TestMethodName = "MyTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AttributeTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
-                Name = "MyTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AttributeTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AttributeTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
-                    Name = "AttributeTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MyTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AttributeTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AttributeTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
+    Name = "AttributeTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AttributeTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AttributeTests>(
+            "MyTest", "MyTest", 7,
+            __InvokeTest_MyTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MyTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AttributeTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
index c118dc5b3a..edbb68244a 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
index 7cbee2092f..ff76da63bb 100644
--- a/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,84 +9,32 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BeforeTests.SetupTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                    Name = "SetupTests",
-                    Namespace = "TUnit.TestProject.BeforeTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test2 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BeforeTests.SetupTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                    Name = "SetupTests",
-                    Namespace = "TUnit.TestProject.BeforeTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata_Test2.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+        Name = "SetupTests",
+        Namespace = "TUnit.TestProject.BeforeTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
+            "Test1", "Test1", 98,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
+            "Test2", "Test2", 104,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -153,88 +101,48 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BeforeTests.SetupTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                    Name = "SetupTests",
-                    Namespace = "TUnit.TestProject.BeforeTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+    Name = "SetupTests",
+    Namespace = "TUnit.TestProject.BeforeTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
+            "Test1", "Test1", 98,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BeforeTests.SetupTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                    Name = "SetupTests",
-                    Namespace = "TUnit.TestProject.BeforeTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+    Name = "SetupTests",
+    Namespace = "TUnit.TestProject.BeforeTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
+            "Test2", "Test2", 104,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BeforeTests.SetupTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
index 7cbee2092f..ff76da63bb 100644
--- a/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,84 +9,32 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BeforeTests.SetupTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                    Name = "SetupTests",
-                    Namespace = "TUnit.TestProject.BeforeTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test2 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BeforeTests.SetupTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                    Name = "SetupTests",
-                    Namespace = "TUnit.TestProject.BeforeTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata_Test2.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+        Name = "SetupTests",
+        Namespace = "TUnit.TestProject.BeforeTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
+            "Test1", "Test1", 98,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
+            "Test2", "Test2", 104,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -153,88 +101,48 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BeforeTests.SetupTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                    Name = "SetupTests",
-                    Namespace = "TUnit.TestProject.BeforeTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+    Name = "SetupTests",
+    Namespace = "TUnit.TestProject.BeforeTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
+            "Test1", "Test1", 98,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BeforeTests.SetupTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-                    Name = "SetupTests",
-                    Namespace = "TUnit.TestProject.BeforeTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+    Name = "SetupTests",
+    Namespace = "TUnit.TestProject.BeforeTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
+            "Test2", "Test2", 104,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BeforeTests.SetupTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
index 20dacc9e49..dcb30ef2b0 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SimpleTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2971.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SimpleTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-            TestMethodName = "SimpleTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                Name = "SimpleTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2971",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleTest,
-        };
-        metadata_SimpleTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2971",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
+        var metadata_SimpleTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
+            "SimpleTest", "SimpleTest", 19,
+            __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SimpleTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -90,45 +70,25 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2971.Tests>
-        {
-            TestName = "SimpleTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-            TestMethodName = "SimpleTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                Name = "SimpleTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2971",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._2971",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
+            "SimpleTest", "SimpleTest", 19,
+            __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._2971.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
index 20dacc9e49..dcb30ef2b0 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SimpleTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2971.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SimpleTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-            TestMethodName = "SimpleTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                Name = "SimpleTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2971",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleTest,
-        };
-        metadata_SimpleTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2971",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
+        var metadata_SimpleTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
+            "SimpleTest", "SimpleTest", 19,
+            __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SimpleTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -90,45 +70,25 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2971.Tests>
-        {
-            TestName = "SimpleTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-            TestMethodName = "SimpleTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                Name = "SimpleTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2971",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._2971",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
+            "SimpleTest", "SimpleTest", 19,
+            __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._2971.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
index 20dacc9e49..dcb30ef2b0 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SimpleTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2971.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SimpleTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-            TestMethodName = "SimpleTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                Name = "SimpleTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2971",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleTest,
-        };
-        metadata_SimpleTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2971",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
+        var metadata_SimpleTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
+            "SimpleTest", "SimpleTest", 19,
+            __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SimpleTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -90,45 +70,25 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2971.Tests>
-        {
-            TestName = "SimpleTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-            TestMethodName = "SimpleTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                Name = "SimpleTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2971",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._2971",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
+            "SimpleTest", "SimpleTest", 19,
+            __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._2971.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
index 7ae71795dd..0ef8deadcb 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SimpleTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2971.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SimpleTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-            TestMethodName = "SimpleTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                Name = "SimpleTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2971",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleTest,
-        };
-        metadata_SimpleTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2971",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
+        var metadata_SimpleTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
+            "SimpleTest", "SimpleTest", 19,
+            __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SimpleTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -90,45 +70,25 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2971.Tests>
-        {
-            TestName = "SimpleTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-            TestMethodName = "SimpleTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                Name = "SimpleTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2971",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._2971",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
+            "SimpleTest", "SimpleTest", 19,
+            __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._2971.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
index 969287c4c7..46d324f7ab 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,188 +9,91 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Simple = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassAndMethodArgumentsTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Simple",
-            TestClassType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-            TestMethodName = "Simple",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("1"),
-                new global::TUnit.Core.ArgumentsAttribute("2"),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                Name = "Simple",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                    Name = "ClassAndMethodArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "arg1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Simple,
-        };
-        metadata_Simple.UseRuntimeDataGeneration(testSessionId);
-        var metadata_WithMethodLevel__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassAndMethodArgumentsTests>
+        Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+        Name = "ClassAndMethodArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "WithMethodLevel",
-            TestClassType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-            TestMethodName = "WithMethodLevel",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("3"),
-                new global::TUnit.Core.ArgumentsAttribute("4"),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("1"),
-                new global::TUnit.Core.ArgumentsAttribute("2"),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                Name = "WithMethodLevel",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "arg2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetMethod("WithMethodLevel", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                    Name = "ClassAndMethodArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "arg1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_WithMethodLevel__string,
-        };
-        metadata_WithMethodLevel__string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IgnoreParameters__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassAndMethodArgumentsTests>
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
         {
-            TestName = "IgnoreParameters",
-            TestClassType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-            TestMethodName = "IgnoreParameters",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("3"),
-                new global::TUnit.Core.ArgumentsAttribute("4"),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("1"),
-                new global::TUnit.Core.ArgumentsAttribute("2"),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                Name = "IgnoreParameters",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "arg2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetMethod("IgnoreParameters", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                    Name = "ClassAndMethodArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "arg1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IgnoreParameters__string,
-        };
-        metadata_IgnoreParameters__string.UseRuntimeDataGeneration(testSessionId);
+        Name = "arg1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
+        var metadata_Simple = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
+            "Simple", "Simple", 8,
+            __InvokeTest_Simple, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Simple", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("1"),
+            new global::TUnit.Core.ArgumentsAttribute("2"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_WithMethodLevel__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
+            "WithMethodLevel", "WithMethodLevel", 11,
+            __InvokeTest_WithMethodLevel__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("WithMethodLevel", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "arg2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetMethod("WithMethodLevel", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("3"),
+            new global::TUnit.Core.ArgumentsAttribute("4"),
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("1"),
+            new global::TUnit.Core.ArgumentsAttribute("2"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IgnoreParameters__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
+            "IgnoreParameters", "IgnoreParameters", 16,
+            __InvokeTest_IgnoreParameters__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IgnoreParameters", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "arg2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetMethod("IgnoreParameters", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("3"),
+            new global::TUnit.Core.ArgumentsAttribute("4"),
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("1"),
+            new global::TUnit.Core.ArgumentsAttribute("2"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Simple, metadata_WithMethodLevel__string, metadata_IgnoreParameters__string };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -301,196 +204,141 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Simple(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassAndMethodArgumentsTests>
-        {
-            TestName = "Simple",
-            TestClassType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-            TestMethodName = "Simple",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("1"),
-                new global::TUnit.Core.ArgumentsAttribute("2"),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                Name = "Simple",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                    Name = "ClassAndMethodArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "arg1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Simple,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+    Name = "ClassAndMethodArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "arg1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
+            "Simple", "Simple", 8,
+            __InvokeTest_Simple, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Simple", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("1"),
+        new global::TUnit.Core.ArgumentsAttribute("2"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_WithMethodLevel__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassAndMethodArgumentsTests>
-        {
-            TestName = "WithMethodLevel",
-            TestClassType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-            TestMethodName = "WithMethodLevel",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("3"),
-                new global::TUnit.Core.ArgumentsAttribute("4"),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("1"),
-                new global::TUnit.Core.ArgumentsAttribute("2"),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                Name = "WithMethodLevel",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "arg2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetMethod("WithMethodLevel", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                    Name = "ClassAndMethodArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "arg1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_WithMethodLevel__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+    Name = "ClassAndMethodArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "arg1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
+            "WithMethodLevel", "WithMethodLevel", 11,
+            __InvokeTest_WithMethodLevel__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("WithMethodLevel", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "arg2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetMethod("WithMethodLevel", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("3"),
+        new global::TUnit.Core.ArgumentsAttribute("4"),
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("1"),
+        new global::TUnit.Core.ArgumentsAttribute("2"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IgnoreParameters__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassAndMethodArgumentsTests>
-        {
-            TestName = "IgnoreParameters",
-            TestClassType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-            TestMethodName = "IgnoreParameters",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("3"),
-                new global::TUnit.Core.ArgumentsAttribute("4"),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("1"),
-                new global::TUnit.Core.ArgumentsAttribute("2"),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                Name = "IgnoreParameters",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "arg2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetMethod("IgnoreParameters", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-                    Name = "ClassAndMethodArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "arg1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IgnoreParameters__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+    Name = "ClassAndMethodArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "arg1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
+            "IgnoreParameters", "IgnoreParameters", 16,
+            __InvokeTest_IgnoreParameters__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IgnoreParameters", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "arg2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetMethod("IgnoreParameters", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("3"),
+        new global::TUnit.Core.ArgumentsAttribute("4"),
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("1"),
+        new global::TUnit.Core.ArgumentsAttribute("2"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ClassAndMethodArgumentsTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
index 759718a281..a22f422022 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,67 +9,47 @@ internal static class TUnit_TestProject_ClassConstructorTest__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassConstructorTest>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassConstructorTest", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.ClassConstructorTest),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassConstructorTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
-                    Name = "ClassConstructorTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
-                        {
-                            Name = "dummyReferenceTypeClass",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
-                            Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
-                            Name = "DummyReferenceTypeClass",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata_Test.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
+        Name = "ClassConstructorTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
+        {
+        Name = "dummyReferenceTypeClass",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
+        }
+        },
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
+        Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
+        Name = "DummyReferenceTypeClass",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ClassConstructorTest);
+        var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassConstructorTest>(
+            "Test", "Test", 8,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -112,67 +92,47 @@ internal static class TUnit_TestProject_ClassConstructorTest__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassConstructorTest>
-        {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.ClassConstructorTest),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassConstructorTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
-                    Name = "ClassConstructorTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
-                        {
-                            Name = "dummyReferenceTypeClass",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
-                            Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
-                            Name = "DummyReferenceTypeClass",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassConstructorTest", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
+    Name = "ClassConstructorTest",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
+    {
+    Name = "dummyReferenceTypeClass",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
+    }
+    },
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
+    Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
+    Name = "DummyReferenceTypeClass",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassConstructorTest);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassConstructorTest>(
+            "Test", "Test", 8,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ClassConstructorTest CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
index c21191b6f4..05f7b06516 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,433 +9,228 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Class__SomeAsyncDisposableClass = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "DataSource_Class",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "DataSource_Class",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "DataSource_Class",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("DataSource_Class", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Class__SomeAsyncDisposableClass,
-        };
-        metadata_DataSource_Class__SomeAsyncDisposableClass.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Class_Generic__SomeAsyncDisposableClass = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "DataSource_Class_Generic",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "DataSource_Class_Generic",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "DataSource_Class_Generic",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("DataSource_Class_Generic", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Class_Generic__SomeAsyncDisposableClass,
-        };
-        metadata_DataSource_Class_Generic__SomeAsyncDisposableClass.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IsInitialized_With_1_ClassDataSource__InitializableClass = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_1_ClassDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_1_ClassDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_1_ClassDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_1_ClassDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_1_ClassDataSource__InitializableClass,
-        };
-        metadata_IsInitialized_With_1_ClassDataSource__InitializableClass.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_2_ClassDataSources",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_2_ClassDataSources",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_2_ClassDataSources",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_2_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_2_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass,
-        };
-        metadata_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_3_ClassDataSources",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_3_ClassDataSources",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 38,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_3_ClassDataSources",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass,
-        };
-        metadata_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_4_ClassDataSources",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_4_ClassDataSources",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 47,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_4_ClassDataSources",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass,
-        };
-        metadata_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_5_ClassDataSources",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_5_ClassDataSources",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 57,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_5_ClassDataSources",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[3]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class5",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[4]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass,
-        };
-        metadata_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+        Name = "ClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
+        var metadata_DataSource_Class__SomeAsyncDisposableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "DataSource_Class", "DataSource_Class", 9,
+            __InvokeTest_DataSource_Class__SomeAsyncDisposableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Class", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("DataSource_Class", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Class_Generic__SomeAsyncDisposableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "DataSource_Class_Generic", "DataSource_Class_Generic", 16,
+            __InvokeTest_DataSource_Class_Generic__SomeAsyncDisposableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Class_Generic", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("DataSource_Class_Generic", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IsInitialized_With_1_ClassDataSource__InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_1_ClassDataSource", "IsInitialized_With_1_ClassDataSource", 23,
+            __InvokeTest_IsInitialized_With_1_ClassDataSource__InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_1_ClassDataSource", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_1_ClassDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_2_ClassDataSources", "IsInitialized_With_2_ClassDataSources", 30,
+            __InvokeTest_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_2_ClassDataSources", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_2_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_2_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_3_ClassDataSources", "IsInitialized_With_3_ClassDataSources", 38,
+            __InvokeTest_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_3_ClassDataSources", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_4_ClassDataSources", "IsInitialized_With_4_ClassDataSources", 47,
+            __InvokeTest_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_4_ClassDataSources", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class4",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[3]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_5_ClassDataSources", "IsInitialized_With_5_ClassDataSources", 57,
+            __InvokeTest_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_5_ClassDataSources", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class4",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[3]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+        {
+        Name = "class5",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[4]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Class__SomeAsyncDisposableClass, metadata_DataSource_Class_Generic__SomeAsyncDisposableClass, metadata_IsInitialized_With_1_ClassDataSource__InitializableClass, metadata_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass, metadata_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass, metadata_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass, metadata_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -691,457 +486,324 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Class__SomeAsyncDisposableClass(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "DataSource_Class",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "DataSource_Class",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "DataSource_Class",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("DataSource_Class", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Class__SomeAsyncDisposableClass,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+    Name = "ClassDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "DataSource_Class", "DataSource_Class", 9,
+            __InvokeTest_DataSource_Class__SomeAsyncDisposableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Class", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("DataSource_Class", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Class_Generic__SomeAsyncDisposableClass(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "DataSource_Class_Generic",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "DataSource_Class_Generic",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "DataSource_Class_Generic",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("DataSource_Class_Generic", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Class_Generic__SomeAsyncDisposableClass,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+    Name = "ClassDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "DataSource_Class_Generic", "DataSource_Class_Generic", 16,
+            __InvokeTest_DataSource_Class_Generic__SomeAsyncDisposableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Class_Generic", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("DataSource_Class_Generic", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_1_ClassDataSource__InitializableClass(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_1_ClassDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_1_ClassDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_1_ClassDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_1_ClassDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_1_ClassDataSource__InitializableClass,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+    Name = "ClassDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_1_ClassDataSource", "IsInitialized_With_1_ClassDataSource", 23,
+            __InvokeTest_IsInitialized_With_1_ClassDataSource__InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_1_ClassDataSource", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_1_ClassDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_2_ClassDataSources",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_2_ClassDataSources",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_2_ClassDataSources",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_2_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_2_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+    Name = "ClassDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_2_ClassDataSources", "IsInitialized_With_2_ClassDataSources", 30,
+            __InvokeTest_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_2_ClassDataSources", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_2_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_2_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_3_ClassDataSources",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_3_ClassDataSources",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 38,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_3_ClassDataSources",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+    Name = "ClassDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_3_ClassDataSources", "IsInitialized_With_3_ClassDataSources", 38,
+            __InvokeTest_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_3_ClassDataSources", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_3_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_4_ClassDataSources",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_4_ClassDataSources",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 47,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_4_ClassDataSources",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+    Name = "ClassDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_4_ClassDataSources", "IsInitialized_With_4_ClassDataSources", 47,
+            __InvokeTest_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_4_ClassDataSources", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class4",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_4_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[3]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests>
-        {
-            TestName = "IsInitialized_With_5_ClassDataSources",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-            TestMethodName = "IsInitialized_With_5_ClassDataSources",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 57,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                Name = "IsInitialized_With_5_ClassDataSources",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[3]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
-                    {
-                        Name = "class5",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[4]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-                    Name = "ClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+    Name = "ClassDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
+            "IsInitialized_With_5_ClassDataSources", "IsInitialized_With_5_ClassDataSources", 57,
+            __InvokeTest_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IsInitialized_With_5_ClassDataSources", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class4",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[3]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.InitializableClass))
+    {
+    Name = "class5",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.InitializableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests).GetMethod("IsInitialized_With_5_ClassDataSources", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass), typeof(global::TUnit.TestProject.Library.Models.InitializableClass) }, null)!.GetParameters()[4]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ClassDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
index 1b1c4116fa..86ed2c4585 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,110 +9,51 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Base_Derived1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests2>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Base_Derived1",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-            TestMethodName = "Base_Derived1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-                Name = "Base_Derived1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-                    Name = "ClassDataSourceDrivenTests2",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
-                        {
-                            Name = "base",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Base_Derived1,
-        };
-        metadata_Base_Derived1.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Base_Derived2 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests2>
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
+        Name = "ClassDataSourceDrivenTests2",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "Base_Derived2",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-            TestMethodName = "Base_Derived2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 18,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-                Name = "Base_Derived2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-                    Name = "ClassDataSourceDrivenTests2",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
-                        {
-                            Name = "base",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Base_Derived2,
-        };
-        metadata_Base_Derived2.UseRuntimeDataGeneration(testSessionId);
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
+        {
+        Name = "base",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2);
+        var metadata_Base_Derived1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
+            "Base_Derived1", "Base_Derived1", 12,
+            __InvokeTest_Base_Derived1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Base_Derived1", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Base_Derived2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
+            "Base_Derived2", "Base_Derived2", 18,
+            __InvokeTest_Base_Derived2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Base_Derived2", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Base_Derived1, metadata_Base_Derived2 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -184,114 +125,76 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Base_Derived1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests2>
-        {
-            TestName = "Base_Derived1",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-            TestMethodName = "Base_Derived1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-                Name = "Base_Derived1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-                    Name = "ClassDataSourceDrivenTests2",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
-                        {
-                            Name = "base",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Base_Derived1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
+    Name = "ClassDataSourceDrivenTests2",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
+    {
+    Name = "base",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
+            "Base_Derived1", "Base_Derived1", 12,
+            __InvokeTest_Base_Derived1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Base_Derived1", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Base_Derived2(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTests2>
-        {
-            TestName = "Base_Derived2",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-            TestMethodName = "Base_Derived2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 18,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-                Name = "Base_Derived2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-                    Name = "ClassDataSourceDrivenTests2",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
-                        {
-                            Name = "base",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Base_Derived2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
+    Name = "ClassDataSourceDrivenTests2",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
+    {
+    Name = "base",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
+            "Base_Derived2", "Base_Derived2", 18,
+            __InvokeTest_Base_Derived2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Base_Derived2", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ClassDataSourceDrivenTests2 CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
index 3383938a5e..4e03f6bed3 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,110 +9,60 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Class__SomeAsyncDisposableClass = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSource_Class",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-            TestMethodName = "DataSource_Class",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
+        Name = "ClassDataSourceDrivenTestsSharedKeyed",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed);
+        var metadata_DataSource_Class__SomeAsyncDisposableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
+            "DataSource_Class", "DataSource_Class", 9,
+            __InvokeTest_DataSource_Class__SomeAsyncDisposableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Class", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed).GetMethod("DataSource_Class", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
         {Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-                Name = "DataSource_Class",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed).GetMethod("DataSource_Class", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-                    Name = "ClassDataSourceDrivenTestsSharedKeyed",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Class__SomeAsyncDisposableClass,
-        };
-        metadata_DataSource_Class__SomeAsyncDisposableClass.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Class_Generic__SomeAsyncDisposableClass = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Class_Generic__SomeAsyncDisposableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
+            "DataSource_Class_Generic", "DataSource_Class_Generic", 16,
+            __InvokeTest_DataSource_Class_Generic__SomeAsyncDisposableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Class_Generic", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "DataSource_Class_Generic",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-            TestMethodName = "DataSource_Class_Generic",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed).GetMethod("DataSource_Class_Generic", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
         {Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-                Name = "DataSource_Class_Generic",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed).GetMethod("DataSource_Class_Generic", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-                    Name = "ClassDataSourceDrivenTestsSharedKeyed",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Class_Generic__SomeAsyncDisposableClass,
-        };
-        metadata_DataSource_Class_Generic__SomeAsyncDisposableClass.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Class__SomeAsyncDisposableClass, metadata_DataSource_Class_Generic__SomeAsyncDisposableClass };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -198,114 +148,76 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Class__SomeAsyncDisposableClass(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>
-        {
-            TestName = "DataSource_Class",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-            TestMethodName = "DataSource_Class",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
+    Name = "ClassDataSourceDrivenTestsSharedKeyed",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
+            "DataSource_Class", "DataSource_Class", 9,
+            __InvokeTest_DataSource_Class__SomeAsyncDisposableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Class", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed).GetMethod("DataSource_Class", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
     {Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-                Name = "DataSource_Class",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed).GetMethod("DataSource_Class", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-                    Name = "ClassDataSourceDrivenTestsSharedKeyed",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Class__SomeAsyncDisposableClass,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Class_Generic__SomeAsyncDisposableClass(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>
-        {
-            TestName = "DataSource_Class_Generic",
-            TestClassType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-            TestMethodName = "DataSource_Class_Generic",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
+    Name = "ClassDataSourceDrivenTestsSharedKeyed",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
+            "DataSource_Class_Generic", "DataSource_Class_Generic", 16,
+            __InvokeTest_DataSource_Class_Generic__SomeAsyncDisposableClass, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Class_Generic", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed).GetMethod("DataSource_Class_Generic", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
     {Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-                Name = "DataSource_Class_Generic",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed).GetMethod("DataSource_Class_Generic", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-                    Name = "ClassDataSourceDrivenTestsSharedKeyed",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Class_Generic__SomeAsyncDisposableClass,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
index 5ba79e0733..0a98a50d07 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -19,16 +19,175 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
     #endif
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_TupleMethod__int_string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassTupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
+        Name = "ClassTupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+        }
+        },
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
+        Type = typeof(global::System.ValueTuple<int, string, bool>),
+        Name = "Property1",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
+        Type = typeof(global::System.ValueTuple<int, string, bool>),
+        Name = "Property2",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
+        Type = typeof(global::System.ValueTuple<int, string, bool>),
+        Name = "Property3",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
+        Type = typeof(global::System.ValueTuple<int, string, bool>),
+        Name = "Property4",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests);
+        var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassTupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 27,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+            {
+                Factory = (dataGeneratorMetadata) =>
+                {
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                    {
+                        var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                    }
+                    return Factory();
+                }
+            },
+            new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
+            {
+                Factory = (dataGeneratorMetadata) =>
+                {
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                    {
+                        var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                    }
+                    return Factory();
+                }
+            },
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                Factory = (dataGeneratorMetadata) =>
+                {
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                    {
+                        var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                    }
+                    return Factory();
+                }
+            },
+            new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
+            {
+                Factory = (dataGeneratorMetadata) =>
+                {
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                    {
+                        var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                    }
+                    return Factory();
+                }
+            },
+        },
+            propertyDataSources: new global::TUnit.Core.PropertyDataSource[]
+        {
+            new global::TUnit.Core.PropertyDataSource
+            {
+                PropertyName = "Property1",
+                PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+                DataSource = new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
                 {
                     Factory = (dataGeneratorMetadata) =>
                     {
@@ -40,7 +199,12 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
                         return Factory();
                     }
                 },
-                new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
+            },
+            new global::TUnit.Core.PropertyDataSource
+            {
+                PropertyName = "Property2",
+                PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+                DataSource = new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
                 {
                     Factory = (dataGeneratorMetadata) =>
                     {
@@ -53,9 +217,11 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
                     }
                 },
             },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.PropertyDataSource
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                PropertyName = "Property3",
+                PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+                DataSource = new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
                 {
                     Factory = (dataGeneratorMetadata) =>
                     {
@@ -67,7 +233,12 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
                         return Factory();
                     }
                 },
-                new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
+            },
+            new global::TUnit.Core.PropertyDataSource
+            {
+                PropertyName = "Property4",
+                PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+                DataSource = new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
                 {
                     Factory = (dataGeneratorMetadata) =>
                     {
@@ -80,264 +251,10 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
                     }
                 },
             },
-            PropertyDataSources = new global::TUnit.Core.PropertyDataSource[]
-            {
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property1",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
-                    {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
-                    {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
-                    {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
-                    {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-            },
-            PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-            {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property1",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty1BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 27,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
-                    Name = "ClassTupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "value2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                        {
-                            Name = "value3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-                        }
-                    },
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
-                            Type = typeof(global::System.ValueTuple<int, string, bool>),
-                            Name = "Property1",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
-                            Type = typeof(global::System.ValueTuple<int, string, bool>),
-                            Name = "Property2",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
-                            Type = typeof(global::System.ValueTuple<int, string, bool>),
-                            Name = "Property3",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
-                            Type = typeof(global::System.ValueTuple<int, string, bool>),
-                            Name = "Property4",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata_DataSource_TupleMethod__int_string_bool.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -390,325 +307,242 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ClassTupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
+    Name = "ClassTupleDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+    }
+    },
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
+    Type = typeof(global::System.ValueTuple<int, string, bool>),
+    Name = "Property1",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
+    Type = typeof(global::System.ValueTuple<int, string, bool>),
+    Name = "Property2",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
+    Type = typeof(global::System.ValueTuple<int, string, bool>),
+    Name = "Property3",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
+    Type = typeof(global::System.ValueTuple<int, string, bool>),
+    Name = "Property4",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassTupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 27,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+                    var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = new global::TUnit.Core.PropertyDataSource[]
+                    var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property1",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
-                    {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
-                    {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
-                    {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
-                    {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-            },
-            PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
+                    var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.PropertyInjectionData
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    PropertyName = "Property1",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty1BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
+                    var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            propertyDataSources: new global::TUnit.Core.PropertyDataSource[]
+    {
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property1",
+            PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+            DataSource = new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
+                        var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.PropertyInjectionData
+                    return Factory();
+                }
+            },
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property2",
+            PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+            DataSource = new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
+                        var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.PropertyInjectionData
+                    return Factory();
+                }
+            },
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property3",
+            PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+            DataSource = new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
+                        var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.TupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 27,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property4",
+            PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+            DataSource = new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
             {
-                Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+                        var result = global::TUnit.TestProject.ClassTupleDataSourceDrivenTests.NamedTupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
-                    Name = "ClassTupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "value2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                        {
-                            Name = "value3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-                        }
-                    },
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
-                            Type = typeof(global::System.ValueTuple<int, string, bool>),
-                            Name = "Property1",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
-                            Type = typeof(global::System.ValueTuple<int, string, bool>),
-                            Name = "Property2",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
-                            Type = typeof(global::System.ValueTuple<int, string, bool>),
-                            Name = "Property3",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
-                            Type = typeof(global::System.ValueTuple<int, string, bool>),
-                            Name = "Property4",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ClassTupleDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
index d57491ee7e..de8866edfc 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SecondTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AbstractTests.ConcreteClass2>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SecondTest",
-            TestClassType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-            TestMethodName = "SecondTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                Name = "SecondTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                    Name = "ConcreteClass2",
-                    Namespace = "TUnit.TestProject.AbstractTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SecondTest,
-        };
-        metadata_SecondTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+        Name = "ConcreteClass2",
+        Namespace = "TUnit.TestProject.AbstractTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
+        var metadata_SecondTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
+            "SecondTest", "SecondTest", 11,
+            __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SecondTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -91,45 +71,25 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SecondTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AbstractTests.ConcreteClass2>
-        {
-            TestName = "SecondTest",
-            TestClassType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-            TestMethodName = "SecondTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                Name = "SecondTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                    Name = "ConcreteClass2",
-                    Namespace = "TUnit.TestProject.AbstractTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SecondTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+    Name = "ConcreteClass2",
+    Namespace = "TUnit.TestProject.AbstractTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
+            "SecondTest", "SecondTest", 11,
+            __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AbstractTests.ConcreteClass2 CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
index c118dc5b3a..edbb68244a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
index 696ca8f299..f7ca22ba22 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -9,531 +9,233 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method__int_string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata_DataSource_Method__int_string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumValue__TestEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata_EnumValue__TestEnum.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NullValue__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata_NullValue__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata_EmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NonEmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata_NonEmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_BooleanString__bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata_BooleanString__bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Type__Type = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata_Type__Type.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntegerArray__int__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata_IntegerArray__int__.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntMaxValue__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata_IntMaxValue__int.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+            new global::TUnit.Core.ArgumentsAttribute(2),
+            new global::TUnit.Core.ArgumentsAttribute(3),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+            new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+            new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+            new global::TUnit.Core.ArgumentsAttribute(-1),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(""),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+            new global::TUnit.Core.ArgumentsAttribute(false),
+            new global::TUnit.Core.ArgumentsAttribute(true),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+        {
+        Name = "values",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(2147483647),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -899,567 +601,377 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+        new global::TUnit.Core.ArgumentsAttribute(2),
+        new global::TUnit.Core.ArgumentsAttribute(3),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+        new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+        new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+        new global::TUnit.Core.ArgumentsAttribute(-1),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(""),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+        new global::TUnit.Core.ArgumentsAttribute(false),
+        new global::TUnit.Core.ArgumentsAttribute(true),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+    {
+    Name = "values",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(2147483647),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.DataDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
index 696ca8f299..f7ca22ba22 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -9,531 +9,233 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method__int_string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata_DataSource_Method__int_string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumValue__TestEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata_EnumValue__TestEnum.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NullValue__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata_NullValue__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata_EmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NonEmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata_NonEmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_BooleanString__bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata_BooleanString__bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Type__Type = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata_Type__Type.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntegerArray__int__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata_IntegerArray__int__.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntMaxValue__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata_IntMaxValue__int.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+            new global::TUnit.Core.ArgumentsAttribute(2),
+            new global::TUnit.Core.ArgumentsAttribute(3),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+            new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+            new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+            new global::TUnit.Core.ArgumentsAttribute(-1),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(""),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+            new global::TUnit.Core.ArgumentsAttribute(false),
+            new global::TUnit.Core.ArgumentsAttribute(true),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+        {
+        Name = "values",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(2147483647),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -899,567 +601,377 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+        new global::TUnit.Core.ArgumentsAttribute(2),
+        new global::TUnit.Core.ArgumentsAttribute(3),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+        new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+        new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+        new global::TUnit.Core.ArgumentsAttribute(-1),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(""),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+        new global::TUnit.Core.ArgumentsAttribute(false),
+        new global::TUnit.Core.ArgumentsAttribute(true),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+    {
+    Name = "values",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(2147483647),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.DataDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
index 696ca8f299..f7ca22ba22 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -9,531 +9,233 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method__int_string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata_DataSource_Method__int_string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumValue__TestEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata_EnumValue__TestEnum.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NullValue__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata_NullValue__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata_EmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NonEmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata_NonEmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_BooleanString__bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata_BooleanString__bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Type__Type = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata_Type__Type.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntegerArray__int__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata_IntegerArray__int__.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntMaxValue__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata_IntMaxValue__int.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+            new global::TUnit.Core.ArgumentsAttribute(2),
+            new global::TUnit.Core.ArgumentsAttribute(3),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+            new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+            new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+            new global::TUnit.Core.ArgumentsAttribute(-1),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(""),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+            new global::TUnit.Core.ArgumentsAttribute(false),
+            new global::TUnit.Core.ArgumentsAttribute(true),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+        {
+        Name = "values",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(2147483647),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -899,567 +601,377 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+        new global::TUnit.Core.ArgumentsAttribute(2),
+        new global::TUnit.Core.ArgumentsAttribute(3),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+        new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+        new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+        new global::TUnit.Core.ArgumentsAttribute(-1),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(""),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+        new global::TUnit.Core.ArgumentsAttribute(false),
+        new global::TUnit.Core.ArgumentsAttribute(true),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+    {
+    Name = "values",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(2147483647),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.DataDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
index 52c56694f0..7c08a2d311 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -9,531 +9,233 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method__int_string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata_DataSource_Method__int_string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumValue__TestEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata_EnumValue__TestEnum.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NullValue__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata_NullValue__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata_EmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NonEmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata_NonEmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_BooleanString__bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata_BooleanString__bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Type__Type = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata_Type__Type.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntegerArray__int__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata_IntegerArray__int__.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntMaxValue__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata_IntMaxValue__int.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+            new global::TUnit.Core.ArgumentsAttribute(2),
+            new global::TUnit.Core.ArgumentsAttribute(3),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+            new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+            new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+            new global::TUnit.Core.ArgumentsAttribute(-1),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(""),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+            new global::TUnit.Core.ArgumentsAttribute(false),
+            new global::TUnit.Core.ArgumentsAttribute(true),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+        {
+        Name = "values",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(2147483647),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -899,567 +601,377 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+        new global::TUnit.Core.ArgumentsAttribute(2),
+        new global::TUnit.Core.ArgumentsAttribute(3),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+        new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+        new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+        new global::TUnit.Core.ArgumentsAttribute(-1),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(""),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+        new global::TUnit.Core.ArgumentsAttribute(false),
+        new global::TUnit.Core.ArgumentsAttribute(true),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+    {
+    Name = "values",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(2147483647),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.DataDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
index ccc00bd8c7..28e629be6d 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -9,760 +9,369 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_MatrixTest_One__string_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata_MatrixTest_One__string_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Two__int_int_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata_MatrixTest_Two__int_int_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata_MatrixTest_Enum__int_TestEnum_TestEnum_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools__string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata_AutoGenerateBools__string_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools2__string_bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata_AutoGenerateBools2__string_bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method1__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata_Method1__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Exclusion__int_int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata_Exclusion__int_int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
+        {
+        Name = "testEnum2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "flag",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1231,808 +840,561 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
+    {
+    Name = "testEnum2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "flag",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MatrixTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
index ccc00bd8c7..28e629be6d 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -9,760 +9,369 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_MatrixTest_One__string_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata_MatrixTest_One__string_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Two__int_int_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata_MatrixTest_Two__int_int_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata_MatrixTest_Enum__int_TestEnum_TestEnum_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools__string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata_AutoGenerateBools__string_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools2__string_bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata_AutoGenerateBools2__string_bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method1__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata_Method1__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Exclusion__int_int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata_Exclusion__int_int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
+        {
+        Name = "testEnum2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "flag",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1231,808 +840,561 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
+    {
+    Name = "testEnum2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "flag",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MatrixTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
index ccc00bd8c7..28e629be6d 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -9,760 +9,369 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_MatrixTest_One__string_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata_MatrixTest_One__string_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Two__int_int_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata_MatrixTest_Two__int_int_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata_MatrixTest_Enum__int_TestEnum_TestEnum_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools__string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata_AutoGenerateBools__string_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools2__string_bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata_AutoGenerateBools2__string_bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method1__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata_Method1__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Exclusion__int_int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata_Exclusion__int_int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
+        {
+        Name = "testEnum2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "flag",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1231,808 +840,561 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
+    {
+    Name = "testEnum2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "flag",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MatrixTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
index 70e2f9dfe6..a04ba00a0f 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -9,760 +9,369 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_MatrixTest_One__string_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata_MatrixTest_One__string_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Two__int_int_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata_MatrixTest_Two__int_int_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata_MatrixTest_Enum__int_TestEnum_TestEnum_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools__string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata_AutoGenerateBools__string_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools2__string_bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata_AutoGenerateBools2__string_bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method1__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata_Method1__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Exclusion__int_int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata_Exclusion__int_int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
+        {
+        Name = "testEnum2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "flag",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1231,808 +840,561 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(TestEnum?))
+    {
+    Name = "testEnum2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(TestEnum?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(TestEnum), typeof(TestEnum?) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<TestEnum, TestEnum2>))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<TestEnum, TestEnum2>)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "flag",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MatrixTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
index f4e7e393ae..d844a9b12c 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -9,507 +9,302 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+        {
+        Name = "action",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata_DataSource_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method_WithAction__Action = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { 5 },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { 5 };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata_DataSource_Method_WithAction__Action.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 6, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 6, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata_DataSource_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
-        {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 8, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 8, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata_DataSource_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_WithBaseReturn__BaseValue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata_DataSource_WithBaseReturn__BaseValue.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumerableFuncArrayTest__string__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+        {
+        Name = "strings",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
-                    {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata_EnumerableFuncArrayTest__string__.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -769,531 +564,398 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+    {
+    Name = "action",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
-                    {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { 5 },
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                // Capture Arguments from the attribute
+                var arguments = new object[] { 5 };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 6, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 6, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 8, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 8, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+    {
+    Name = "strings",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+                    else
                     {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MethodDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
index f4e7e393ae..d844a9b12c 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -9,507 +9,302 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+        {
+        Name = "action",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata_DataSource_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method_WithAction__Action = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { 5 },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { 5 };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata_DataSource_Method_WithAction__Action.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 6, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 6, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata_DataSource_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
-        {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 8, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 8, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata_DataSource_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_WithBaseReturn__BaseValue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata_DataSource_WithBaseReturn__BaseValue.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumerableFuncArrayTest__string__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+        {
+        Name = "strings",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
-                    {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata_EnumerableFuncArrayTest__string__.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -769,531 +564,398 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+    {
+    Name = "action",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
-                    {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { 5 },
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                // Capture Arguments from the attribute
+                var arguments = new object[] { 5 };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 6, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 6, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 8, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 8, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+    {
+    Name = "strings",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+                    else
                     {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MethodDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
index f4e7e393ae..d844a9b12c 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -9,507 +9,302 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+        {
+        Name = "action",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata_DataSource_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method_WithAction__Action = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { 5 },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { 5 };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata_DataSource_Method_WithAction__Action.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 6, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 6, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata_DataSource_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
-        {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 8, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 8, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata_DataSource_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_WithBaseReturn__BaseValue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata_DataSource_WithBaseReturn__BaseValue.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumerableFuncArrayTest__string__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+        {
+        Name = "strings",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
-                    {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata_EnumerableFuncArrayTest__string__.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -769,531 +564,398 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+    {
+    Name = "action",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
-                    {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { 5 },
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                // Capture Arguments from the attribute
+                var arguments = new object[] { 5 };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 6, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 6, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 8, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 8, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+    {
+    Name = "strings",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+                    else
                     {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MethodDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
index fd9f47931f..4a0380760c 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
@@ -9,507 +9,302 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+        {
+        Name = "action",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata_DataSource_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method_WithAction__Action = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { 5 },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { 5 };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata_DataSource_Method_WithAction__Action.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 6, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 6, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata_DataSource_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
-        {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 8, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 8, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata_DataSource_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_WithBaseReturn__BaseValue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata_DataSource_WithBaseReturn__BaseValue.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumerableFuncArrayTest__string__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+        {
+        Name = "strings",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
-                    {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata_EnumerableFuncArrayTest__string__.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -769,531 +564,398 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+    {
+    Name = "action",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
-                    {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { 5 },
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                // Capture Arguments from the attribute
+                var arguments = new object[] { 5 };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 6, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 6, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 8, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 8, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+    {
+    Name = "strings",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+                    else
                     {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MethodDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
index 341381d3aa..8f2f20ebcf 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -9,82 +9,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_TupleMethod__int_string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
             {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+                        var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata_DataSource_TupleMethod__int_string_bool.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -135,82 +116,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+    Name = "TupleDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.TupleDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
index 341381d3aa..8f2f20ebcf 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -9,82 +9,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_TupleMethod__int_string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
             {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+                        var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata_DataSource_TupleMethod__int_string_bool.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -135,82 +116,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+    Name = "TupleDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.TupleDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
index 341381d3aa..8f2f20ebcf 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -9,82 +9,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_TupleMethod__int_string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
             {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+                        var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata_DataSource_TupleMethod__int_string_bool.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -135,82 +116,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+    Name = "TupleDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.TupleDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
index 950f7c42cb..a651380f8a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
@@ -9,82 +9,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_TupleMethod__int_string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
             {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+                        var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata_DataSource_TupleMethod__int_string_bool.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -135,82 +116,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+    Name = "TupleDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.TupleDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
index 417e7b3f01..c17fef5f2a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,363 +9,158 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_String1__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "String1",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "String1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("123"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "String1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("String1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_String1__string,
-        };
-        metadata_String1__string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Int__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "Int",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "Int",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "Int",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Int__int,
-        };
-        metadata_Int__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Double__double = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "Double",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "Double",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.23d),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "Double",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Double__double,
-        };
-        metadata_Double__double.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Float__float = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "Float",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "Float",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.23000002f),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 37,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "Float",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(float))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Float__float,
-        };
-        metadata_Float__float.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Long__long = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "Long",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "Long",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 44,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "Long",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(long))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Long__long,
-        };
-        metadata_Long__long.UseRuntimeDataGeneration(testSessionId);
-        var metadata_UInt__uint = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "UInt",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "UInt",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123U),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 51,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "UInt",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(uint))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_UInt__uint,
-        };
-        metadata_UInt__uint.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ULong__ulong = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "ULong",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "ULong",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123UL),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "ULong",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(ulong))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ULong__ulong,
-        };
-        metadata_ULong__ulong.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+        Name = "ConstantArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
+        var metadata_String1__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "String1", "String1", 16,
+            __InvokeTest_String1__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("String1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "dummy",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("String1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("123"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Int__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "Int", "Int", 23,
+            __InvokeTest_Int__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Int", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "dummy",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(123),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Double__double = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "Double", "Double", 30,
+            __InvokeTest_Double__double, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Double", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(double))
+        {
+        Name = "dummy",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1.23d),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Float__float = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "Float", "Float", 37,
+            __InvokeTest_Float__float, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Float", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(float))
+        {
+        Name = "dummy",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1.23000002f),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Long__long = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "Long", "Long", 44,
+            __InvokeTest_Long__long, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Long", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(long))
+        {
+        Name = "dummy",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(123L),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_UInt__uint = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "UInt", "UInt", 51,
+            __InvokeTest_UInt__uint, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("UInt", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(uint))
+        {
+        Name = "dummy",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(123U),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ULong__ulong = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "ULong", "ULong", 58,
+            __InvokeTest_ULong__ulong, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ULong", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(ulong))
+        {
+        Name = "dummy",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(123UL),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_String1__string, metadata_Int__int, metadata_Double__double, metadata_Float__float, metadata_Long__long, metadata_UInt__uint, metadata_ULong__ulong };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -619,387 +414,254 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_String1__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "String1",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "String1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("123"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "String1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("String1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_String1__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+    Name = "ConstantArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "String1", "String1", 16,
+            __InvokeTest_String1__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("String1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "dummy",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("String1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("123"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Int__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "Int",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "Int",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "Int",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Int__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+    Name = "ConstantArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "Int", "Int", 23,
+            __InvokeTest_Int__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Int", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "dummy",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(123),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Double__double(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "Double",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "Double",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.23d),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "Double",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Double__double,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+    Name = "ConstantArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "Double", "Double", 30,
+            __InvokeTest_Double__double, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Double", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(double))
+    {
+    Name = "dummy",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1.23d),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Float__float(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "Float",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "Float",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.23000002f),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 37,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "Float",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(float))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Float__float,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+    Name = "ConstantArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "Float", "Float", 37,
+            __InvokeTest_Float__float, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Float", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(float))
+    {
+    Name = "dummy",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1.23000002f),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Long__long(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "Long",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "Long",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 44,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "Long",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(long))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Long__long,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+    Name = "ConstantArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "Long", "Long", 44,
+            __InvokeTest_Long__long, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Long", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(long))
+    {
+    Name = "dummy",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(123L),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_UInt__uint(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "UInt",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "UInt",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123U),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 51,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "UInt",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(uint))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_UInt__uint,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+    Name = "ConstantArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "UInt", "UInt", 51,
+            __InvokeTest_UInt__uint, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("UInt", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(uint))
+    {
+    Name = "dummy",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(123U),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ULong__ulong(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConstantArgumentsTests>
-        {
-            TestName = "ULong",
-            TestClassType = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-            TestMethodName = "ULong",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123UL),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                Name = "ULong",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(ulong))
-                    {
-                        Name = "dummy",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-                    Name = "ConstantArgumentsTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ULong__ulong,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+    Name = "ConstantArgumentsTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
+            "ULong", "ULong", 58,
+            __InvokeTest_ULong__ulong, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ULong", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(ulong))
+    {
+    Name = "dummy",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ConstantArgumentsTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(123UL),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ConstantArgumentsTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
index 223fbee097..b943473e1d 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,57 +9,38 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantInBaseClassTests__Tes
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SomeTest__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SomeTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
-            TestMethodName = "SomeTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Value"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 13,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
-                Name = "SomeTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
-                    Name = "ConstantInBaseClassTests",
-                    Namespace = "TUnit.TestProject.Bugs._1432",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SomeTest__string,
-        };
-        metadata_SomeTest__string.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
+        Name = "ConstantInBaseClassTests",
+        Namespace = "TUnit.TestProject.Bugs._1432",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests);
+        var metadata_SomeTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests>(
+            "SomeTest", "SomeTest", 13,
+            __InvokeTest_SomeTest__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SomeTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("Value"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SomeTest__string };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -109,57 +90,38 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantInBaseClassTests__Tes
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SomeTest__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests>
-        {
-            TestName = "SomeTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
-            TestMethodName = "SomeTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Value"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 13,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
-                Name = "SomeTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
-                    Name = "ConstantInBaseClassTests",
-                    Namespace = "TUnit.TestProject.Bugs._1432",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SomeTest__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
+    Name = "ConstantInBaseClassTests",
+    Namespace = "TUnit.TestProject.Bugs._1432",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests>(
+            "SomeTest", "SomeTest", 13,
+            __InvokeTest_SomeTest__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SomeTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("Value"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
index 5651e31b8d..59182ef402 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,57 +9,38 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantsInInterpolatedString
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SomeTest__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SomeTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
-            TestMethodName = "SomeTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute($"{"Value"}1"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 13,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
-                Name = "SomeTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
-                    Name = "ConstantsInInterpolatedStringsTests",
-                    Namespace = "TUnit.TestProject.Bugs._1432",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SomeTest__string,
-        };
-        metadata_SomeTest__string.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
+        Name = "ConstantsInInterpolatedStringsTests",
+        Namespace = "TUnit.TestProject.Bugs._1432",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests);
+        var metadata_SomeTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests>(
+            "SomeTest", "SomeTest", 13,
+            __InvokeTest_SomeTest__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SomeTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute($"{"Value"}1"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SomeTest__string };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -109,57 +90,38 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantsInInterpolatedString
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SomeTest__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests>
-        {
-            TestName = "SomeTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
-            TestMethodName = "SomeTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute($"{"Value"}1"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 13,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
-                Name = "SomeTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
-                    Name = "ConstantsInInterpolatedStringsTests",
-                    Namespace = "TUnit.TestProject.Bugs._1432",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SomeTest__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
+    Name = "ConstantsInInterpolatedStringsTests",
+    Namespace = "TUnit.TestProject.Bugs._1432",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests>(
+            "SomeTest", "SomeTest", 13,
+            __InvokeTest_SomeTest__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SomeTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute($"{"Value"}1"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
index f572ca84bf..5a6d465f88 100644
--- a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,557 +9,181 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata_Test.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test2 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 18,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata_Test2.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test3__string_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "Test3",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "Test3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_2,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("foo", 1, true),
-                new global::TUnit.Core.ArgumentsAttribute("bar", 2, false),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 25,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "Test3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test3__string_int_bool,
-        };
-        metadata_Test3__string_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MethodDataSourceTest__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "MethodDataSourceTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "MethodDataSourceTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_3,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("Method")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CustomDisplayNameTests.Method();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 37,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "MethodDataSourceTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "foo",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("MethodDataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MethodDataSourceTest__string,
-        };
-        metadata_MethodDataSourceTest__string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_TestParameterNamePrefixBug__int_string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "TestParameterNamePrefixBug",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "TestParameterNamePrefixBug",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_4,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(100, "Type1"),
-                new global::TUnit.Core.ArgumentsAttribute(200, "Type2"),
-                new global::TUnit.Core.ArgumentsAttribute(300, "Type1"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "TestParameterNamePrefixBug",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "someValue",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("TestParameterNamePrefixBug", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "someValueType",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("TestParameterNamePrefixBug", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestParameterNamePrefixBug__int_string,
-        };
-        metadata_TestParameterNamePrefixBug__int_string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_PasswordTest__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "Test", "Test", 11,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "Test2", "Test2", 18,
+            __InvokeTest_Test2, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test3__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "Test3", "Test3", 25,
+            __InvokeTest_Test3__string_int_bool, __CreateAttributes_2, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("foo", 1, true),
+            new global::TUnit.Core.ArgumentsAttribute("bar", 2, false),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MethodDataSourceTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "MethodDataSourceTest", "MethodDataSourceTest", 37,
+            __InvokeTest_MethodDataSourceTest__string, __CreateAttributes_3, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MethodDataSourceTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "foo",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("MethodDataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "PasswordTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "PasswordTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_5,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.CustomDisplayNameTests.MyGenerator(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("Method")
             {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "PasswordTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "password",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("PasswordTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.CustomDisplayNameTests.Method();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_PasswordTest__string,
-        };
-        metadata_PasswordTest__string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_SameClassConstantTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "SameClassConstantTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "SameClassConstantTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_6,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "SameClassConstantTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SameClassConstantTest,
-        };
-        metadata_SameClassConstantTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DifferentClassConstantTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "DifferentClassConstantTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "DifferentClassConstantTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_6,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "DifferentClassConstantTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DifferentClassConstantTest,
-        };
-        metadata_DifferentClassConstantTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NestedClassConstantTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "NestedClassConstantTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "NestedClassConstantTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_6,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 86,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "NestedClassConstantTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NestedClassConstantTest,
-        };
-        metadata_NestedClassConstantTest.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_TestParameterNamePrefixBug__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "TestParameterNamePrefixBug", "TestParameterNamePrefixBug", 45,
+            __InvokeTest_TestParameterNamePrefixBug__int_string, __CreateAttributes_4, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestParameterNamePrefixBug", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "someValue",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("TestParameterNamePrefixBug", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "someValueType",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("TestParameterNamePrefixBug", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(100, "Type1"),
+            new global::TUnit.Core.ArgumentsAttribute(200, "Type2"),
+            new global::TUnit.Core.ArgumentsAttribute(300, "Type1"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_PasswordTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "PasswordTest", "PasswordTest", 65,
+            __InvokeTest_PasswordTest__string, __CreateAttributes_5, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("PasswordTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "password",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("PasswordTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.TestProject.CustomDisplayNameTests.MyGenerator(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_SameClassConstantTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "SameClassConstantTest", "SameClassConstantTest", 72,
+            __InvokeTest_SameClassConstantTest, __CreateAttributes_6, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SameClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DifferentClassConstantTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "DifferentClassConstantTest", "DifferentClassConstantTest", 79,
+            __InvokeTest_DifferentClassConstantTest, __CreateAttributes_6, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DifferentClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NestedClassConstantTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "NestedClassConstantTest", "NestedClassConstantTest", 86,
+            __InvokeTest_NestedClassConstantTest, __CreateAttributes_6, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NestedClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test, metadata_Test2, metadata_Test3__string_int_bool, metadata_MethodDataSourceTest__string, metadata_TestParameterNamePrefixBug__int_string, metadata_PasswordTest__string, metadata_SameClassConstantTest, metadata_DifferentClassConstantTest, metadata_NestedClassConstantTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -895,589 +519,413 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+    Name = "CustomDisplayNameTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+    Type = typeof(int),
+    Name = "Order",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "Test", "Test", 11,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 18,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+    Name = "CustomDisplayNameTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+    Type = typeof(int),
+    Name = "Order",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "Test2", "Test2", 18,
+            __InvokeTest_Test2, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test3__string_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "Test3",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "Test3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_2,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("foo", 1, true),
-                new global::TUnit.Core.ArgumentsAttribute("bar", 2, false),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 25,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "Test3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test3__string_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+    Name = "CustomDisplayNameTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+    Type = typeof(int),
+    Name = "Order",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "Test3", "Test3", 25,
+            __InvokeTest_Test3__string_int_bool, __CreateAttributes_2, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("Test3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("foo", 1, true),
+        new global::TUnit.Core.ArgumentsAttribute("bar", 2, false),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MethodDataSourceTest__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+    Name = "CustomDisplayNameTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+    Type = typeof(int),
+    Name = "Order",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "MethodDataSourceTest", "MethodDataSourceTest", 37,
+            __InvokeTest_MethodDataSourceTest__string, __CreateAttributes_3, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MethodDataSourceTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "foo",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("MethodDataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("Method")
         {
-            TestName = "MethodDataSourceTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "MethodDataSourceTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_3,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("Method")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CustomDisplayNameTests.Method();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 37,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "MethodDataSourceTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "foo",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("MethodDataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MethodDataSourceTest__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.CustomDisplayNameTests.Method();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestParameterNamePrefixBug__int_string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "TestParameterNamePrefixBug",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "TestParameterNamePrefixBug",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_4,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(100, "Type1"),
-                new global::TUnit.Core.ArgumentsAttribute(200, "Type2"),
-                new global::TUnit.Core.ArgumentsAttribute(300, "Type1"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "TestParameterNamePrefixBug",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "someValue",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("TestParameterNamePrefixBug", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "someValueType",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("TestParameterNamePrefixBug", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestParameterNamePrefixBug__int_string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+    Name = "CustomDisplayNameTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+    Type = typeof(int),
+    Name = "Order",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "TestParameterNamePrefixBug", "TestParameterNamePrefixBug", 45,
+            __InvokeTest_TestParameterNamePrefixBug__int_string, __CreateAttributes_4, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestParameterNamePrefixBug", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "someValue",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("TestParameterNamePrefixBug", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "someValueType",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("TestParameterNamePrefixBug", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(100, "Type1"),
+        new global::TUnit.Core.ArgumentsAttribute(200, "Type2"),
+        new global::TUnit.Core.ArgumentsAttribute(300, "Type1"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_PasswordTest__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "PasswordTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "PasswordTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_5,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.CustomDisplayNameTests.MyGenerator(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "PasswordTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "password",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("PasswordTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_PasswordTest__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+    Name = "CustomDisplayNameTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+    Type = typeof(int),
+    Name = "Order",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "PasswordTest", "PasswordTest", 65,
+            __InvokeTest_PasswordTest__string, __CreateAttributes_5, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("PasswordTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "password",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetMethod("PasswordTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.TestProject.CustomDisplayNameTests.MyGenerator(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SameClassConstantTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "SameClassConstantTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "SameClassConstantTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_6,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "SameClassConstantTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SameClassConstantTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+    Name = "CustomDisplayNameTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+    Type = typeof(int),
+    Name = "Order",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "SameClassConstantTest", "SameClassConstantTest", 72,
+            __InvokeTest_SameClassConstantTest, __CreateAttributes_6, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SameClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DifferentClassConstantTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "DifferentClassConstantTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "DifferentClassConstantTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_6,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "DifferentClassConstantTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DifferentClassConstantTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+    Name = "CustomDisplayNameTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+    Type = typeof(int),
+    Name = "Order",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "DifferentClassConstantTest", "DifferentClassConstantTest", 79,
+            __InvokeTest_DifferentClassConstantTest, __CreateAttributes_6, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DifferentClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NestedClassConstantTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CustomDisplayNameTests>
-        {
-            TestName = "NestedClassConstantTest",
-            TestClassType = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-            TestMethodName = "NestedClassConstantTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_6,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 86,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                Name = "NestedClassConstantTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-                    Name = "CustomDisplayNameTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-                            Type = typeof(int),
-                            Name = "Order",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NestedClassConstantTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+    Name = "CustomDisplayNameTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+    Type = typeof(int),
+    Name = "Order",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
+            "NestedClassConstantTest", "NestedClassConstantTest", 86,
+            __InvokeTest_NestedClassConstantTest, __CreateAttributes_6, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NestedClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.CustomDisplayNameTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
index 696ca8f299..7c08a2d311 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,531 +9,233 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method__int_string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata_DataSource_Method__int_string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumValue__TestEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata_EnumValue__TestEnum.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NullValue__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata_NullValue__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata_EmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NonEmptyString__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata_NonEmptyString__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_BooleanString__bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata_BooleanString__bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Type__Type = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata_Type__Type.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntegerArray__int__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata_IntegerArray__int__.UseRuntimeDataGeneration(testSessionId);
-        var metadata_IntMaxValue__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata_IntMaxValue__int.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+            new global::TUnit.Core.ArgumentsAttribute(2),
+            new global::TUnit.Core.ArgumentsAttribute(3),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+            new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+            new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+            new global::TUnit.Core.ArgumentsAttribute(-1),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(""),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+            new global::TUnit.Core.ArgumentsAttribute(false),
+            new global::TUnit.Core.ArgumentsAttribute(true),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+        {
+        Name = "values",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(2147483647),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -899,567 +601,377 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+        new global::TUnit.Core.ArgumentsAttribute(2),
+        new global::TUnit.Core.ArgumentsAttribute(3),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int_string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 17,
+            __InvokeTest_DataSource_Method__int_string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1, "String"),
+        new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
+        new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EnumValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EnumValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EnumValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumValue__TestEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EnumValue", "EnumValue", 26,
+            __InvokeTest_EnumValue__TestEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EnumValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.TestEnum) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
+        new global::TUnit.Core.ArgumentsAttribute(-1),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NullValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NullValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 35,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NullValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullValue__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NullValue", "NullValue", 35,
+            __InvokeTest_NullValue__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NullValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "EmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "EmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "EmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "EmptyString", "EmptyString", 42,
+            __InvokeTest_EmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("EmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(""),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "NonEmptyString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "NonEmptyString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "NonEmptyString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonEmptyString__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "NonEmptyString", "NonEmptyString", 49,
+            __InvokeTest_NonEmptyString__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonEmptyString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("NonEmptyString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "BooleanString",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "BooleanString",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 56,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "BooleanString",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BooleanString__bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "BooleanString", "BooleanString", 56,
+            __InvokeTest_BooleanString__bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BooleanString", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("BooleanString", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool?) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+        new global::TUnit.Core.ArgumentsAttribute(false),
+        new global::TUnit.Core.ArgumentsAttribute(true),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "Type",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "Type",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 65,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "Type",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Type__Type,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "Type", "Type", 65,
+            __InvokeTest_Type__Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Type", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("Type", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Type) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntegerArray",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntegerArray",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 72,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntegerArray",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
-                    {
-                        Name = "values",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntegerArray__int__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntegerArray", "IntegerArray", 72,
+            __InvokeTest_IntegerArray__int__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntegerArray", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int[]))
+    {
+    Name = "values",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntegerArray", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataDrivenTests>
-        {
-            TestName = "IntMaxValue",
-            TestClassType = typeof(global::TUnit.TestProject.DataDrivenTests),
-            TestMethodName = "IntMaxValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 79,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                Name = "IntMaxValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-                    Name = "DataDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_IntMaxValue__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+    Name = "DataDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
+            "IntMaxValue", "IntMaxValue", 79,
+            __InvokeTest_IntMaxValue__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("IntMaxValue", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataDrivenTests).GetMethod("IntMaxValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(2147483647),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.DataDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
index 5d8759f732..296124df04 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,139 +9,121 @@ internal static class TUnit_TestProject_DataSourceClassCombinedWithDataSourceMet
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSourceClassCombinedWithDataSourceMethodTest__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSourceClassCombinedWithDataSourceMethodTest",
-            TestClassType = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
-            TestMethodName = "DataSourceClassCombinedWithDataSourceMethodTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
+        Name = "DataSourceClassCombinedWithDataSourceMethod",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod);
+        var metadata_DataSourceClassCombinedWithDataSourceMethodTest__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod>(
+            "DataSourceClassCombinedWithDataSourceMethodTest", "DataSourceClassCombinedWithDataSourceMethodTest", 13,
+            __InvokeTest_DataSourceClassCombinedWithDataSourceMethodTest__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSourceClassCombinedWithDataSourceMethodTest", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetMethod("DataSourceClassCombinedWithDataSourceMethodTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.One();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.Two();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.CommonTestData.One();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Three")
+                    return Factory();
+                }
+            },
+            new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.Three();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.CommonTestData.Two();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Three")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.One();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.CommonTestData.Three();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two")
+                    return Factory();
+                }
+            },
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.Two();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.CommonTestData.One();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Three")
+                    return Factory();
+                }
+            },
+            new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.Three();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.CommonTestData.Two();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 13,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Three")
             {
-                Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
-                Name = "DataSourceClassCombinedWithDataSourceMethodTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetMethod("DataSourceClassCombinedWithDataSourceMethodTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.CommonTestData.Three();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
-                    Name = "DataSourceClassCombinedWithDataSourceMethod",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "i",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSourceClassCombinedWithDataSourceMethodTest__int,
-        };
-        metadata_DataSourceClassCombinedWithDataSourceMethodTest__int.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSourceClassCombinedWithDataSourceMethodTest__int };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -195,139 +177,121 @@ internal static class TUnit_TestProject_DataSourceClassCombinedWithDataSourceMet
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSourceClassCombinedWithDataSourceMethodTest__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
+    Name = "DataSourceClassCombinedWithDataSourceMethod",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod>(
+            "DataSourceClassCombinedWithDataSourceMethodTest", "DataSourceClassCombinedWithDataSourceMethodTest", 13,
+            __InvokeTest_DataSourceClassCombinedWithDataSourceMethodTest__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSourceClassCombinedWithDataSourceMethodTest", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetMethod("DataSourceClassCombinedWithDataSourceMethodTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One")
         {
-            TestName = "DataSourceClassCombinedWithDataSourceMethodTest",
-            TestClassType = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
-            TestMethodName = "DataSourceClassCombinedWithDataSourceMethodTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.One();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.Two();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Three")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.Three();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+                    var result = global::TUnit.TestProject.CommonTestData.One();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.One();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two")
+                    var result = global::TUnit.TestProject.CommonTestData.Two();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Three")
+        {
+            Factory = (dataGeneratorMetadata) =>
+            {
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.Two();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Three")
+                    var result = global::TUnit.TestProject.CommonTestData.Three();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One")
+        {
+            Factory = (dataGeneratorMetadata) =>
+            {
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.CommonTestData.Three();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 13,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.CommonTestData.One();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
-                Name = "DataSourceClassCombinedWithDataSourceMethodTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetMethod("DataSourceClassCombinedWithDataSourceMethodTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod", new global::TUnit.Core.ClassMetadata
+                    var result = global::TUnit.TestProject.CommonTestData.Two();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Three")
+        {
+            Factory = (dataGeneratorMetadata) =>
+            {
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
-                    Name = "DataSourceClassCombinedWithDataSourceMethod",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "i",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSourceClassCombinedWithDataSourceMethodTest__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.CommonTestData.Three();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
index cb2e0c34ca..44ba9a519a 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,268 +9,144 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_GeneratedData_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataSourceGeneratorTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "GeneratedData_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-            TestMethodName = "GeneratedData_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int>(),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                Name = "GeneratedData_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                    Name = "DataSourceGeneratorTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "value2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                        {
-                            Name = "value3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_GeneratedData_Method__int,
-        };
-        metadata_GeneratedData_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_GeneratedData_Method2__int_string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataSourceGeneratorTests>
+        Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+        Name = "DataSourceGeneratorTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "GeneratedData_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-            TestMethodName = "GeneratedData_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 18,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                Name = "GeneratedData_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                    Name = "DataSourceGeneratorTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "value2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                        {
-                            Name = "value3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_GeneratedData_Method2__int_string_bool,
-        };
-        metadata_GeneratedData_Method2__int_string_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_GeneratedData_Method3__int_string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataSourceGeneratorTests>
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
         {
-            TestName = "GeneratedData_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-            TestMethodName = "GeneratedData_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 24,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                Name = "GeneratedData_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                    Name = "DataSourceGeneratorTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "value2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                        {
-                            Name = "value3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_GeneratedData_Method3__int_string_bool,
-        };
-        metadata_GeneratedData_Method3__int_string_bool.UseRuntimeDataGeneration(testSessionId);
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
+        var metadata_GeneratedData_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
+            "GeneratedData_Method", "GeneratedData_Method", 12,
+            __InvokeTest_GeneratedData_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("GeneratedData_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int>(),
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
+            new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_GeneratedData_Method2__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
+            "GeneratedData_Method2", "GeneratedData_Method2", 18,
+            __InvokeTest_GeneratedData_Method2__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("GeneratedData_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
+            new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_GeneratedData_Method3__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
+            "GeneratedData_Method3", "GeneratedData_Method3", 24,
+            __InvokeTest_GeneratedData_Method3__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("GeneratedData_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
+            new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_GeneratedData_Method__int, metadata_GeneratedData_Method2__int_string_bool, metadata_GeneratedData_Method3__int_string_bool };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -393,276 +269,222 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_GeneratedData_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataSourceGeneratorTests>
-        {
-            TestName = "GeneratedData_Method",
-            TestClassType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-            TestMethodName = "GeneratedData_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int>(),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                Name = "GeneratedData_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                    Name = "DataSourceGeneratorTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "value2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                        {
-                            Name = "value3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_GeneratedData_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+    Name = "DataSourceGeneratorTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
+            "GeneratedData_Method", "GeneratedData_Method", 12,
+            __InvokeTest_GeneratedData_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("GeneratedData_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int>(),
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
+        new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_GeneratedData_Method2__int_string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataSourceGeneratorTests>
-        {
-            TestName = "GeneratedData_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-            TestMethodName = "GeneratedData_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 18,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                Name = "GeneratedData_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                    Name = "DataSourceGeneratorTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "value2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                        {
-                            Name = "value3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_GeneratedData_Method2__int_string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+    Name = "DataSourceGeneratorTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
+            "GeneratedData_Method2", "GeneratedData_Method2", 18,
+            __InvokeTest_GeneratedData_Method2__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("GeneratedData_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
+        new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_GeneratedData_Method3__int_string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DataSourceGeneratorTests>
-        {
-            TestName = "GeneratedData_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-            TestMethodName = "GeneratedData_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 24,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                Name = "GeneratedData_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-                    Name = "DataSourceGeneratorTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(string))
-                        {
-                            Name = "value2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                        {
-                            Name = "value3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_GeneratedData_Method3__int_string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+    Name = "DataSourceGeneratorTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
+            "GeneratedData_Method3", "GeneratedData_Method3", 24,
+            __InvokeTest_GeneratedData_Method3__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("GeneratedData_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetMethod("GeneratedData_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
+        new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.DataSourceGeneratorTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
index 359fba98f6..201840aae8 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,78 +9,59 @@ internal static class TUnit_TestProject_AutoDataTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1__string_int_double_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AutoDataTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AutoDataTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.AutoDataTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoDataAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AutoDataTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AutoDataTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AutoDataTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
-                    Name = "AutoDataTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1__string_int_double_bool,
-        };
-        metadata_Test1__string_int_double_bool.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.AutoDataTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
+        Name = "AutoDataTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AutoDataTests);
+        var metadata_Test1__string_int_double_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AutoDataTests>(
+            "Test1", "Test1", 7,
+            __InvokeTest_Test1__string_int_double_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(double))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value4",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[3]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.TestProject.Attributes.AutoDataAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1__string_int_double_bool };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -129,78 +110,59 @@ internal static class TUnit_TestProject_AutoDataTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1__string_int_double_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AutoDataTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.AutoDataTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.TestProject.Attributes.AutoDataAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AutoDataTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AutoDataTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AutoDataTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
-                    Name = "AutoDataTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1__string_int_double_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AutoDataTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AutoDataTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
+    Name = "AutoDataTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AutoDataTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AutoDataTests>(
+            "Test1", "Test1", 7,
+            __InvokeTest_Test1__string_int_double_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(double))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value4",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AutoDataTests).GetMethod("Test1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(double), typeof(bool) }, null)!.GetParameters()[3]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.TestProject.Attributes.AutoDataAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AutoDataTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
index 00eed611e9..0df804ef29 100644
--- a/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,680 +9,320 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Transfer__decimal_decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Transfer",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "Transfer",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2_000m, 123_999.00000000000000001m),
-                new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999m),
-                new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999.00000000000000001m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "Transfer",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "debit",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Transfer", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "credit",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Transfer", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Transfer__decimal_decimal,
-        };
-        metadata_Transfer__decimal_decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_SimpleDecimal__decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "SimpleDecimal",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "SimpleDecimal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123.456m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 29,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "SimpleDecimal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("SimpleDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleDecimal__decimal,
-        };
-        metadata_SimpleDecimal__decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_SmallDecimal__decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "SmallDecimal",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "SmallDecimal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0.00000000000000001m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "SmallDecimal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("SmallDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SmallDecimal__decimal,
-        };
-        metadata_SmallDecimal__decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MaxDecimal__decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "MaxDecimal",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "MaxDecimal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("79228162514264337593543950335"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 43,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "MaxDecimal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MaxDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MaxDecimal__decimal,
-        };
-        metadata_MaxDecimal__decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MinDecimal__decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "MinDecimal",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "MinDecimal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("-79228162514264337593543950335"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 50,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "MinDecimal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MinDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MinDecimal__decimal,
-        };
-        metadata_MinDecimal__decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ExplicitDecimalValue__decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "ExplicitDecimalValue",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "ExplicitDecimalValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("123.456"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 57,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "ExplicitDecimalValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("ExplicitDecimalValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExplicitDecimalValue__decimal,
-        };
-        metadata_ExplicitDecimalValue__decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MultipleDecimals__decimal_decimal_decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "MultipleDecimals",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "MultipleDecimals",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1m, 2.2m, 3.3m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "MultipleDecimals",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "a",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "b",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "c",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MultipleDecimals__decimal_decimal_decimal,
-        };
-        metadata_MultipleDecimals__decimal_decimal_decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test__decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0.5m),
-                new global::TUnit.Core.ArgumentsAttribute(0.75m),
-                new global::TUnit.Core.ArgumentsAttribute(1m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 73,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "test",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test__decimal,
-        };
-        metadata_Test__decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "TransactionDiscountCalculations",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "TransactionDiscountCalculations",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(50m, 75m, 70m, 5m, 0m, true),
-                new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 5m, true),
-                new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 0m, false),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 82,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "TransactionDiscountCalculations",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "amountPaying",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "invoiceBalance",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "invoiceBalanceDue",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "discountAmount",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[3]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "appliedDiscountAmount",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[4]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "discountAllowedForUser",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[5]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool,
-        };
-        metadata_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Equality3__decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "Equality3",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "Equality3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 91,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "Equality3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "credit",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Equality3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Equality3__decimal,
-        };
-        metadata_Equality3__decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Equality4__decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "Equality4",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "Equality4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123_999.00000000000000001m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "Equality4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "credit",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Equality4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Equality4__decimal,
-        };
-        metadata_Equality4__decimal.UseRuntimeDataGeneration(testSessionId);
-        var metadata_TestMethod__decimal = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "TestMethod",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "TestMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(42),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 119,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "TestMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "batchingSize",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TestMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestMethod__decimal,
-        };
-        metadata_TestMethod__decimal.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata_Transfer__decimal_decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "Transfer", "Transfer", 9,
+            __InvokeTest_Transfer__decimal_decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Transfer", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "debit",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Transfer", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "credit",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Transfer", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(2_000m, 123_999.00000000000000001m),
+            new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999m),
+            new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999.00000000000000001m),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_SimpleDecimal__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "SimpleDecimal", "SimpleDecimal", 29,
+            __InvokeTest_SimpleDecimal__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleDecimal", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("SimpleDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(123.456m),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_SmallDecimal__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "SmallDecimal", "SmallDecimal", 36,
+            __InvokeTest_SmallDecimal__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SmallDecimal", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("SmallDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(0.00000000000000001m),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MaxDecimal__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "MaxDecimal", "MaxDecimal", 43,
+            __InvokeTest_MaxDecimal__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MaxDecimal", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MaxDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("79228162514264337593543950335"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MinDecimal__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "MinDecimal", "MinDecimal", 50,
+            __InvokeTest_MinDecimal__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MinDecimal", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MinDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("-79228162514264337593543950335"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ExplicitDecimalValue__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "ExplicitDecimalValue", "ExplicitDecimalValue", 57,
+            __InvokeTest_ExplicitDecimalValue__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExplicitDecimalValue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("ExplicitDecimalValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("123.456"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MultipleDecimals__decimal_decimal_decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "MultipleDecimals", "MultipleDecimals", 64,
+            __InvokeTest_MultipleDecimals__decimal_decimal_decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MultipleDecimals", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "a",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "b",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "c",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1.1m, 2.2m, 3.3m),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "Test", "Test", 73,
+            __InvokeTest_Test__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "test",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(0.5m),
+            new global::TUnit.Core.ArgumentsAttribute(0.75m),
+            new global::TUnit.Core.ArgumentsAttribute(1m),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "TransactionDiscountCalculations", "TransactionDiscountCalculations", 82,
+            __InvokeTest_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TransactionDiscountCalculations", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "amountPaying",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "invoiceBalance",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "invoiceBalanceDue",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "discountAmount",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[3]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "appliedDiscountAmount",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[4]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "discountAllowedForUser",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[5]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(50m, 75m, 70m, 5m, 0m, true),
+            new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 5m, true),
+            new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 0m, false),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Equality3__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "Equality3", "Equality3", 91,
+            __InvokeTest_Equality3__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Equality3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "credit",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Equality3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Equality4__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "Equality4", "Equality4", 104,
+            __InvokeTest_Equality4__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Equality4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "credit",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Equality4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(123_999.00000000000000001m),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_TestMethod__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "TestMethod", "TestMethod", 119,
+            __InvokeTest_TestMethod__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestMethod", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+        {
+        Name = "batchingSize",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TestMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(42),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Transfer__decimal_decimal, metadata_SimpleDecimal__decimal, metadata_SmallDecimal__decimal, metadata_MaxDecimal__decimal, metadata_MinDecimal__decimal, metadata_ExplicitDecimalValue__decimal, metadata_MultipleDecimals__decimal_decimal_decimal, metadata_Test__decimal, metadata_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool, metadata_Equality3__decimal, metadata_Equality4__decimal, metadata_TestMethod__decimal };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1108,724 +748,496 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Transfer__decimal_decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "Transfer",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "Transfer",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2_000m, 123_999.00000000000000001m),
-                new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999m),
-                new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999.00000000000000001m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "Transfer",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "debit",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Transfer", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "credit",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Transfer", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Transfer__decimal_decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "Transfer", "Transfer", 9,
+            __InvokeTest_Transfer__decimal_decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Transfer", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "debit",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Transfer", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "credit",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Transfer", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(2_000m, 123_999.00000000000000001m),
+        new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999m),
+        new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999.00000000000000001m),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleDecimal__decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "SimpleDecimal",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "SimpleDecimal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123.456m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 29,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "SimpleDecimal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("SimpleDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SimpleDecimal__decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "SimpleDecimal", "SimpleDecimal", 29,
+            __InvokeTest_SimpleDecimal__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SimpleDecimal", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("SimpleDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(123.456m),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SmallDecimal__decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "SmallDecimal",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "SmallDecimal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0.00000000000000001m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "SmallDecimal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("SmallDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SmallDecimal__decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "SmallDecimal", "SmallDecimal", 36,
+            __InvokeTest_SmallDecimal__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SmallDecimal", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("SmallDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(0.00000000000000001m),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MaxDecimal__decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "MaxDecimal",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "MaxDecimal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("79228162514264337593543950335"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 43,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "MaxDecimal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MaxDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MaxDecimal__decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "MaxDecimal", "MaxDecimal", 43,
+            __InvokeTest_MaxDecimal__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MaxDecimal", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MaxDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("79228162514264337593543950335"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MinDecimal__decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "MinDecimal",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "MinDecimal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("-79228162514264337593543950335"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 50,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "MinDecimal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MinDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MinDecimal__decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "MinDecimal", "MinDecimal", 50,
+            __InvokeTest_MinDecimal__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MinDecimal", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MinDecimal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("-79228162514264337593543950335"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExplicitDecimalValue__decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "ExplicitDecimalValue",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "ExplicitDecimalValue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("123.456"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 57,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "ExplicitDecimalValue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("ExplicitDecimalValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExplicitDecimalValue__decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "ExplicitDecimalValue", "ExplicitDecimalValue", 57,
+            __InvokeTest_ExplicitDecimalValue__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExplicitDecimalValue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("ExplicitDecimalValue", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("123.456"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MultipleDecimals__decimal_decimal_decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "MultipleDecimals",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "MultipleDecimals",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1m, 2.2m, 3.3m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "MultipleDecimals",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "a",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "b",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "c",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MultipleDecimals__decimal_decimal_decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "MultipleDecimals", "MultipleDecimals", 64,
+            __InvokeTest_MultipleDecimals__decimal_decimal_decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MultipleDecimals", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "a",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "b",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "c",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("MultipleDecimals", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1.1m, 2.2m, 3.3m),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test__decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0.5m),
-                new global::TUnit.Core.ArgumentsAttribute(0.75m),
-                new global::TUnit.Core.ArgumentsAttribute(1m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 73,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "test",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test__decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "Test", "Test", 73,
+            __InvokeTest_Test__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "test",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(0.5m),
+        new global::TUnit.Core.ArgumentsAttribute(0.75m),
+        new global::TUnit.Core.ArgumentsAttribute(1m),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "TransactionDiscountCalculations",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "TransactionDiscountCalculations",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(50m, 75m, 70m, 5m, 0m, true),
-                new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 5m, true),
-                new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 0m, false),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 82,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "TransactionDiscountCalculations",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "amountPaying",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "invoiceBalance",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "invoiceBalanceDue",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "discountAmount",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[3]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "appliedDiscountAmount",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[4]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "discountAllowedForUser",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[5]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "TransactionDiscountCalculations", "TransactionDiscountCalculations", 82,
+            __InvokeTest_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TransactionDiscountCalculations", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "amountPaying",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "invoiceBalance",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "invoiceBalanceDue",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "discountAmount",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[3]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "appliedDiscountAmount",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[4]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "discountAllowedForUser",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TransactionDiscountCalculations", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(decimal), typeof(bool) }, null)!.GetParameters()[5]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(50m, 75m, 70m, 5m, 0m, true),
+        new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 5m, true),
+        new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 0m, false),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Equality3__decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "Equality3",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "Equality3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 91,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "Equality3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "credit",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Equality3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Equality3__decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "Equality3", "Equality3", 91,
+            __InvokeTest_Equality3__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Equality3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "credit",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Equality3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Equality4__decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "Equality4",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "Equality4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(123_999.00000000000000001m),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 104,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "Equality4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "credit",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Equality4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Equality4__decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "Equality4", "Equality4", 104,
+            __InvokeTest_Equality4__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Equality4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "credit",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("Equality4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(123_999.00000000000000001m),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestMethod__decimal(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.DecimalArgumentTests>
-        {
-            TestName = "TestMethod",
-            TestClassType = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-            TestMethodName = "TestMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(42),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 119,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                Name = "TestMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
-                    {
-                        Name = "batchingSize",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TestMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-                    Name = "DecimalArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestMethod__decimal,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+    Name = "DecimalArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
+            "TestMethod", "TestMethod", 119,
+            __InvokeTest_TestMethod__decimal, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestMethod", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(decimal))
+    {
+    Name = "batchingSize",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(decimal)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.DecimalArgumentTests).GetMethod("TestMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(decimal) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(42),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.DecimalArgumentTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
index e0575be242..f0e587b614 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
index c118dc5b3a..edbb68244a 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
@@ -9,123 +9,39 @@ internal static class TUnit_TestProject_BasicTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata_SynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata_AsynchronousTest.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ValueTaskAsynchronousTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata_ValueTaskAsynchronousTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,131 +135,71 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "SynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "SynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 5,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "SynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "SynchronousTest", "SynchronousTest", 5,
+            __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "AsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "AsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "AsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "AsynchronousTest", "AsynchronousTest", 11,
+            __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.BasicTests>
-        {
-            TestName = "ValueTaskAsynchronousTest",
-            TestClassType = typeof(global::TUnit.TestProject.BasicTests),
-            TestMethodName = "ValueTaskAsynchronousTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.BasicTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                Name = "ValueTaskAsynchronousTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.ValueTask),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.ValueTask)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.BasicTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-                    Name = "BasicTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ValueTaskAsynchronousTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.BasicTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+    Name = "BasicTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.BasicTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
+            "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
+            __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.BasicTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
index ebbd2ea121..9e7dda5e3f 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,59 +9,40 @@ internal static class TUnit_TestProject_Bugs__1432_EnumMemberNamesTests__TestSou
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SomeTest__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SomeTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
-            TestMethodName = "SomeTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("A"),
-                new global::TUnit.Core.ArgumentsAttribute("B"),
-                new global::TUnit.Core.ArgumentsAttribute("C"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
-                Name = "SomeTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
-                    Name = "EnumMemberNamesTests",
-                    Namespace = "TUnit.TestProject.Bugs._1432",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SomeTest__string,
-        };
-        metadata_SomeTest__string.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
+        Name = "EnumMemberNamesTests",
+        Namespace = "TUnit.TestProject.Bugs._1432",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests);
+        var metadata_SomeTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests>(
+            "SomeTest", "SomeTest", 8,
+            __InvokeTest_SomeTest__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SomeTest", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("A"),
+            new global::TUnit.Core.ArgumentsAttribute("B"),
+            new global::TUnit.Core.ArgumentsAttribute("C"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SomeTest__string };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -112,59 +93,40 @@ internal static class TUnit_TestProject_Bugs__1432_EnumMemberNamesTests__TestSou
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SomeTest__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests>
-        {
-            TestName = "SomeTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
-            TestMethodName = "SomeTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("A"),
-                new global::TUnit.Core.ArgumentsAttribute("B"),
-                new global::TUnit.Core.ArgumentsAttribute("C"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
-                Name = "SomeTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
-                    Name = "EnumMemberNamesTests",
-                    Namespace = "TUnit.TestProject.Bugs._1432",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SomeTest__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
+    Name = "EnumMemberNamesTests",
+    Namespace = "TUnit.TestProject.Bugs._1432",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests>(
+            "SomeTest", "SomeTest", 8,
+            __InvokeTest_SomeTest__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SomeTest", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests).GetMethod("SomeTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("A"),
+        new global::TUnit.Core.ArgumentsAttribute("B"),
+        new global::TUnit.Core.ArgumentsAttribute("C"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
index ad3574e50c..0a49161fb9 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,222 +9,141 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+        Name = "EnumerableDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.SomeMethod();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.SomeMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                    Name = "EnumerableDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 15,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.SomeMethod();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.SomeMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                    Name = "EnumerableDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata_DataSource_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_WithBaseReturn__BaseValue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 22,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.MethodWithBaseReturn();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.MethodWithBaseReturn();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 22,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                    Name = "EnumerableDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata_DataSource_WithBaseReturn__BaseValue.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_WithBaseReturn__BaseValue };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -343,230 +262,173 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+    Name = "EnumerableDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 8,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.SomeMethod();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.SomeMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    else
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                    Name = "EnumerableDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+    Name = "EnumerableDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 15,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.SomeMethod();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.SomeMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    else
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                    Name = "EnumerableDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+    Name = "EnumerableDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 22,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.MethodWithBaseReturn();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.EnumerableDataSourceDrivenTests.MethodWithBaseReturn();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 22,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue))
+                    else
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-                    Name = "EnumerableDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.EnumerableDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
index 19232995f6..827c951cd0 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,114 +9,95 @@ internal static class TUnit_TestProject_EnumerableTupleDataSourceDrivenTests__Te
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_TupleMethod__int_string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
+        Name = "EnumerableTupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests);
+        var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests.TupleMethod();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests.TupleMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        else
                         {
-                            var result = global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests.NamedTupleMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                        return Factory();
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
             {
-                Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+                        var result = global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests.NamedTupleMethod();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                        {
+                            foreach (var item in enumerable)
+                            {
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
+                            }
+                        }
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
-                    Name = "EnumerableTupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata_DataSource_TupleMethod__int_string_bool.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -167,114 +148,95 @@ internal static class TUnit_TestProject_EnumerableTupleDataSourceDrivenTests__Te
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
+    Name = "EnumerableTupleDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests.TupleMethod();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests.TupleMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
+                    else
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests.NamedTupleMethod();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                        }
-                        return Factory();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
+                    var result = global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests.NamedTupleMethod();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                        foreach (var item in enumerable)
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
+                        }
+                    }
+                    else
                     {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
-                    Name = "EnumerableTupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
index f318df3e28..a029d15426 100644
--- a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,148 +9,98 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_TypedArguments__object_Type = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ExpectedArgumentTypeTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "TypedArguments",
-            TestClassType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-            TestMethodName = "TypedArguments",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0d, typeof(double)),
-                new global::TUnit.Core.ArgumentsAttribute(0f, typeof(float)),
-                new global::TUnit.Core.ArgumentsAttribute((sbyte)0, typeof(sbyte)),
-                new global::TUnit.Core.ArgumentsAttribute((byte)0, typeof(byte)),
-                new global::TUnit.Core.ArgumentsAttribute((short)0, typeof(short)),
-                new global::TUnit.Core.ArgumentsAttribute((ushort)0, typeof(ushort)),
-                new global::TUnit.Core.ArgumentsAttribute(0, typeof(int)),
-                new global::TUnit.Core.ArgumentsAttribute((uint)0, typeof(uint)),
-                new global::TUnit.Core.ArgumentsAttribute(0u, typeof(uint)),
-                new global::TUnit.Core.ArgumentsAttribute((long)0, typeof(long)),
-                new global::TUnit.Core.ArgumentsAttribute(0L, typeof(long)),
-                new global::TUnit.Core.ArgumentsAttribute((ulong)0, typeof(ulong)),
-                new global::TUnit.Core.ArgumentsAttribute(0UL, typeof(ulong)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-                Name = "TypedArguments",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(object))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(object)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("TypedArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "expectedType",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("TypedArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-                    Name = "ExpectedArgumentTypeTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TypedArguments__object_Type,
-        };
-        metadata_TypedArguments__object_Type.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumTypes__object_Type_Type = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ExpectedArgumentTypeTests>
+        Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
+        Name = "ExpectedArgumentTypeTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests);
+        var metadata_TypedArguments__object_Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
+            "TypedArguments", "TypedArguments", 8,
+            __InvokeTest_TypedArguments__object_Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TypedArguments", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "EnumTypes",
-            TestClassType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-            TestMethodName = "EnumTypes",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.ByteEnum.Default, typeof(global::TUnit.TestProject.ByteEnum), typeof(byte)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.SByteEnum.Default, typeof(global::TUnit.TestProject.SByteEnum), typeof(sbyte)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int16Enum.Default, typeof(global::TUnit.TestProject.Int16Enum), typeof(short)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt16Enum.Default, typeof(global::TUnit.TestProject.UInt16Enum), typeof(ushort)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int32Enum.Default, typeof(global::TUnit.TestProject.Int32Enum), typeof(int)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt32Enum.Default, typeof(global::TUnit.TestProject.UInt32Enum), typeof(uint)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int64Enum.Default, typeof(global::TUnit.TestProject.Int64Enum), typeof(long)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt64Enum.Default, typeof(global::TUnit.TestProject.UInt64Enum), typeof(ulong)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 25,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-                Name = "EnumTypes",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(object))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(object)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "expectedValueType",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "expectedEnumUnderlyingType",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-                    Name = "ExpectedArgumentTypeTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumTypes__object_Type_Type,
-        };
-        metadata_EnumTypes__object_Type_Type.UseRuntimeDataGeneration(testSessionId);
+        new global::TUnit.Core.ParameterMetadata(typeof(object))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(object)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("TypedArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+        {
+        Name = "expectedType",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("TypedArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(0d, typeof(double)),
+            new global::TUnit.Core.ArgumentsAttribute(0f, typeof(float)),
+            new global::TUnit.Core.ArgumentsAttribute((sbyte)0, typeof(sbyte)),
+            new global::TUnit.Core.ArgumentsAttribute((byte)0, typeof(byte)),
+            new global::TUnit.Core.ArgumentsAttribute((short)0, typeof(short)),
+            new global::TUnit.Core.ArgumentsAttribute((ushort)0, typeof(ushort)),
+            new global::TUnit.Core.ArgumentsAttribute(0, typeof(int)),
+            new global::TUnit.Core.ArgumentsAttribute((uint)0, typeof(uint)),
+            new global::TUnit.Core.ArgumentsAttribute(0u, typeof(uint)),
+            new global::TUnit.Core.ArgumentsAttribute((long)0, typeof(long)),
+            new global::TUnit.Core.ArgumentsAttribute(0L, typeof(long)),
+            new global::TUnit.Core.ArgumentsAttribute((ulong)0, typeof(ulong)),
+            new global::TUnit.Core.ArgumentsAttribute(0UL, typeof(ulong)),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumTypes__object_Type_Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
+            "EnumTypes", "EnumTypes", 25,
+            __InvokeTest_EnumTypes__object_Type_Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumTypes", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(object))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(object)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+        {
+        Name = "expectedValueType",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+        {
+        Name = "expectedEnumUnderlyingType",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.ByteEnum.Default, typeof(global::TUnit.TestProject.ByteEnum), typeof(byte)),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.SByteEnum.Default, typeof(global::TUnit.TestProject.SByteEnum), typeof(sbyte)),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int16Enum.Default, typeof(global::TUnit.TestProject.Int16Enum), typeof(short)),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt16Enum.Default, typeof(global::TUnit.TestProject.UInt16Enum), typeof(ushort)),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int32Enum.Default, typeof(global::TUnit.TestProject.Int32Enum), typeof(int)),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt32Enum.Default, typeof(global::TUnit.TestProject.UInt32Enum), typeof(uint)),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int64Enum.Default, typeof(global::TUnit.TestProject.Int64Enum), typeof(long)),
+            new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt64Enum.Default, typeof(global::TUnit.TestProject.UInt64Enum), typeof(ulong)),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_TypedArguments__object_Type, metadata_EnumTypes__object_Type_Type };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -234,152 +184,114 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TypedArguments__object_Type(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ExpectedArgumentTypeTests>
-        {
-            TestName = "TypedArguments",
-            TestClassType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-            TestMethodName = "TypedArguments",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0d, typeof(double)),
-                new global::TUnit.Core.ArgumentsAttribute(0f, typeof(float)),
-                new global::TUnit.Core.ArgumentsAttribute((sbyte)0, typeof(sbyte)),
-                new global::TUnit.Core.ArgumentsAttribute((byte)0, typeof(byte)),
-                new global::TUnit.Core.ArgumentsAttribute((short)0, typeof(short)),
-                new global::TUnit.Core.ArgumentsAttribute((ushort)0, typeof(ushort)),
-                new global::TUnit.Core.ArgumentsAttribute(0, typeof(int)),
-                new global::TUnit.Core.ArgumentsAttribute((uint)0, typeof(uint)),
-                new global::TUnit.Core.ArgumentsAttribute(0u, typeof(uint)),
-                new global::TUnit.Core.ArgumentsAttribute((long)0, typeof(long)),
-                new global::TUnit.Core.ArgumentsAttribute(0L, typeof(long)),
-                new global::TUnit.Core.ArgumentsAttribute((ulong)0, typeof(ulong)),
-                new global::TUnit.Core.ArgumentsAttribute(0UL, typeof(ulong)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-                Name = "TypedArguments",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(object))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(object)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("TypedArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "expectedType",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("TypedArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-                    Name = "ExpectedArgumentTypeTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TypedArguments__object_Type,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
+    Name = "ExpectedArgumentTypeTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
+            "TypedArguments", "TypedArguments", 8,
+            __InvokeTest_TypedArguments__object_Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TypedArguments", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(object))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(object)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("TypedArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+    {
+    Name = "expectedType",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("TypedArguments", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(0d, typeof(double)),
+        new global::TUnit.Core.ArgumentsAttribute(0f, typeof(float)),
+        new global::TUnit.Core.ArgumentsAttribute((sbyte)0, typeof(sbyte)),
+        new global::TUnit.Core.ArgumentsAttribute((byte)0, typeof(byte)),
+        new global::TUnit.Core.ArgumentsAttribute((short)0, typeof(short)),
+        new global::TUnit.Core.ArgumentsAttribute((ushort)0, typeof(ushort)),
+        new global::TUnit.Core.ArgumentsAttribute(0, typeof(int)),
+        new global::TUnit.Core.ArgumentsAttribute((uint)0, typeof(uint)),
+        new global::TUnit.Core.ArgumentsAttribute(0u, typeof(uint)),
+        new global::TUnit.Core.ArgumentsAttribute((long)0, typeof(long)),
+        new global::TUnit.Core.ArgumentsAttribute(0L, typeof(long)),
+        new global::TUnit.Core.ArgumentsAttribute((ulong)0, typeof(ulong)),
+        new global::TUnit.Core.ArgumentsAttribute(0UL, typeof(ulong)),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumTypes__object_Type_Type(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ExpectedArgumentTypeTests>
-        {
-            TestName = "EnumTypes",
-            TestClassType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-            TestMethodName = "EnumTypes",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.ByteEnum.Default, typeof(global::TUnit.TestProject.ByteEnum), typeof(byte)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.SByteEnum.Default, typeof(global::TUnit.TestProject.SByteEnum), typeof(sbyte)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int16Enum.Default, typeof(global::TUnit.TestProject.Int16Enum), typeof(short)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt16Enum.Default, typeof(global::TUnit.TestProject.UInt16Enum), typeof(ushort)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int32Enum.Default, typeof(global::TUnit.TestProject.Int32Enum), typeof(int)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt32Enum.Default, typeof(global::TUnit.TestProject.UInt32Enum), typeof(uint)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int64Enum.Default, typeof(global::TUnit.TestProject.Int64Enum), typeof(long)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt64Enum.Default, typeof(global::TUnit.TestProject.UInt64Enum), typeof(ulong)),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 25,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-                Name = "EnumTypes",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(object))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(object)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "expectedValueType",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
-                    {
-                        Name = "expectedEnumUnderlyingType",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-                    Name = "ExpectedArgumentTypeTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumTypes__object_Type_Type,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
+    Name = "ExpectedArgumentTypeTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
+            "EnumTypes", "EnumTypes", 25,
+            __InvokeTest_EnumTypes__object_Type_Type, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumTypes", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(object))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(object)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+    {
+    Name = "expectedValueType",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Type))
+    {
+    Name = "expectedEnumUnderlyingType",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Type)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests).GetMethod("EnumTypes", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(object), typeof(global::System.Type), typeof(global::System.Type) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.ByteEnum.Default, typeof(global::TUnit.TestProject.ByteEnum), typeof(byte)),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.SByteEnum.Default, typeof(global::TUnit.TestProject.SByteEnum), typeof(sbyte)),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int16Enum.Default, typeof(global::TUnit.TestProject.Int16Enum), typeof(short)),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt16Enum.Default, typeof(global::TUnit.TestProject.UInt16Enum), typeof(ushort)),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int32Enum.Default, typeof(global::TUnit.TestProject.Int32Enum), typeof(int)),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt32Enum.Default, typeof(global::TUnit.TestProject.UInt32Enum), typeof(uint)),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int64Enum.Default, typeof(global::TUnit.TestProject.Int64Enum), typeof(long)),
+        new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt64Enum.Default, typeof(global::TUnit.TestProject.UInt64Enum), typeof(ulong)),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ExpectedArgumentTypeTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
index d84388ec1c..a37a0a5b72 100644
--- a/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_SimpleTestClass__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_NonGenericTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.SimpleTestClass>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("GenericTypeResolverTests:global::TUnit.TestProject.SimpleTestClass", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "NonGenericTest",
-            TestClassType = typeof(global::TUnit.TestProject.SimpleTestClass),
-            TestMethodName = "NonGenericTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.SimpleTestClass),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
-                Name = "NonGenericTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("GenericTypeResolverTests:global::TUnit.TestProject.SimpleTestClass", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.SimpleTestClass),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
-                    Name = "SimpleTestClass",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonGenericTest,
-        };
-        metadata_NonGenericTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.SimpleTestClass),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
+        Name = "SimpleTestClass",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.SimpleTestClass);
+        var metadata_NonGenericTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.SimpleTestClass>(
+            "NonGenericTest", "NonGenericTest", 7,
+            __InvokeTest_NonGenericTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonGenericTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_NonGenericTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -89,45 +69,25 @@ internal static class TUnit_TestProject_SimpleTestClass__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonGenericTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.SimpleTestClass>
-        {
-            TestName = "NonGenericTest",
-            TestClassType = typeof(global::TUnit.TestProject.SimpleTestClass),
-            TestMethodName = "NonGenericTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.SimpleTestClass),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
-                Name = "NonGenericTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("GenericTypeResolverTests:global::TUnit.TestProject.SimpleTestClass", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.SimpleTestClass),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
-                    Name = "SimpleTestClass",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonGenericTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("GenericTypeResolverTests:global::TUnit.TestProject.SimpleTestClass", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.SimpleTestClass),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
+    Name = "SimpleTestClass",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.SimpleTestClass);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.SimpleTestClass>(
+            "NonGenericTest", "NonGenericTest", 7,
+            __InvokeTest_NonGenericTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonGenericTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.SimpleTestClass CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
index 27bfcc8650..1d21bd7ff4 100644
--- a/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,58 +9,39 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1589.MyTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
+        Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+        Name = "MyTests",
+        Namespace = "TUnit.TestProject.Bugs._1589",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+        {
+        Name = "myFixture",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
+            "Test1", "Test1", 15,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
         {Shared = global::TUnit.Core.SharedType.None,},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-                    Name = "MyTests",
-                    Namespace = "TUnit.TestProject.Bugs._1589",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-                        {
-                            Name = "myFixture",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -104,58 +85,39 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1589.MyTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+    Name = "MyTests",
+    Namespace = "TUnit.TestProject.Bugs._1589",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+    {
+    Name = "myFixture",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
+            "Test1", "Test1", 15,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
     {Shared = global::TUnit.Core.SharedType.None,},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-                    Name = "MyTests",
-                    Namespace = "TUnit.TestProject.Bugs._1589",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-                        {
-                            Name = "myFixture",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1589.MyTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
index 98fe5f94a8..267056f8f6 100644
--- a/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,58 +9,39 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1594.MyTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
+        Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+        Name = "MyTests",
+        Namespace = "TUnit.TestProject.Bugs._1594",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+        {
+        Name = "myFixture",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
+            "Test1", "Test1", 15,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
         {Shared = global::TUnit.Core.SharedType.None,},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-                    Name = "MyTests",
-                    Namespace = "TUnit.TestProject.Bugs._1594",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-                        {
-                            Name = "myFixture",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -105,58 +86,39 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1594.MyTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+    Name = "MyTests",
+    Namespace = "TUnit.TestProject.Bugs._1594",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+    {
+    Name = "myFixture",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
+            "Test1", "Test1", 15,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
     {Shared = global::TUnit.Core.SharedType.None,},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-                    Name = "MyTests",
-                    Namespace = "TUnit.TestProject.Bugs._1594",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-                        {
-                            Name = "myFixture",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1594.MyTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
index 0000f717ed..9102841487 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -23,285 +23,168 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     #endif
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PropertySetterTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.PropertySetterTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = new global::TUnit.Core.PropertyDataSource[]
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+        Name = "PropertySetterTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+        Type = typeof(string),
+        Name = "Property1",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+        Type = typeof(string),
+        Name = "Property2",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property3",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property4",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property5",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property6",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+        Type = typeof(string),
+        Name = "Property7",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+        Name = "StaticProperty",
+        IsStatic = true,
+        IsNullable = false,
+        Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
+        var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
+            "Test", "Test", 69,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            propertyDataSources: new global::TUnit.Core.PropertyDataSource[]
+        {
+            new global::TUnit.Core.PropertyDataSource
             {
-                new global::TUnit.Core.PropertyDataSource
+                PropertyName = "Property2",
+                PropertyType = typeof(string),
+                DataSource = new global::TUnit.Core.MethodDataSourceAttribute("MethodData")
                 {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(string),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("MethodData")
+                    Factory = (dataGeneratorMetadata) =>
                     {
-                        Factory = (dataGeneratorMetadata) =>
+                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                         {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.PropertySetterTests.MethodData();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
+                            var result = global::TUnit.TestProject.PropertySetterTests.MethodData();
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>(),
+                        return Factory();
+                    }
                 },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+            },
+            new global::TUnit.Core.PropertyDataSource
+            {
+                PropertyName = "Property3",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>(),
+            },
+            new global::TUnit.Core.PropertyDataSource
+            {
+                PropertyName = "Property4",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
         {Shared = global::TUnit.Core.SharedType.PerTestSession,},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property5",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+            },
+            new global::TUnit.Core.PropertyDataSource
+            {
+                PropertyName = "Property5",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
         {Shared = global::TUnit.Core.SharedType.PerClass,},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property6",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
-        {Shared = global::TUnit.Core.SharedType.Keyed,Key = "Key",},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property7",
-                    PropertyType = typeof(string),
-                    DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
-                },
             },
-            PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
+            new global::TUnit.Core.PropertyDataSource
             {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property5",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property6",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property7",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
+                PropertyName = "Property6",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+        {Shared = global::TUnit.Core.SharedType.Keyed,Key = "Key",},
             },
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 69,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.PropertyDataSource
             {
-                Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-                    Name = "PropertySetterTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-                            Type = typeof(string),
-                            Name = "Property1",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-                            Type = typeof(string),
-                            Name = "Property2",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property3",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property4",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property5",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property6",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-                            Type = typeof(string),
-                            Name = "Property7",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-                            Name = "StaticProperty",
-                            IsStatic = true,
-                            IsNullable = false,
-                            Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
+                PropertyName = "Property7",
+                PropertyType = typeof(string),
+                DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata_Test.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -344,285 +227,168 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PropertySetterTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+    Name = "PropertySetterTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+    Type = typeof(string),
+    Name = "Property1",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+    Type = typeof(string),
+    Name = "Property2",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+    Name = "Property3",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+    Name = "Property4",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+    Name = "Property5",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+    Name = "Property6",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+    Type = typeof(string),
+    Name = "Property7",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+    Name = "StaticProperty",
+    IsStatic = true,
+    IsNullable = false,
+    Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
+            "Test", "Test", 69,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            propertyDataSources: new global::TUnit.Core.PropertyDataSource[]
+    {
+        new global::TUnit.Core.PropertyDataSource
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.PropertySetterTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = new global::TUnit.Core.PropertyDataSource[]
+            PropertyName = "Property2",
+            PropertyType = typeof(string),
+            DataSource = new global::TUnit.Core.MethodDataSourceAttribute("MethodData")
             {
-                new global::TUnit.Core.PropertyDataSource
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(string),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("MethodData")
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.PropertySetterTests.MethodData();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>(),
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+                        var result = global::TUnit.TestProject.PropertySetterTests.MethodData();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                    }
+                    return Factory();
+                }
+            },
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property3",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>(),
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property4",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
     {Shared = global::TUnit.Core.SharedType.PerTestSession,},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property5",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property5",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
     {Shared = global::TUnit.Core.SharedType.PerClass,},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property6",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property6",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
     {Shared = global::TUnit.Core.SharedType.Keyed,Key = "Key",},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property7",
-                    PropertyType = typeof(string),
-                    DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
-                },
-            },
-            PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-            {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property5",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property6",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property7",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 69,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-                    Name = "PropertySetterTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-                            Type = typeof(string),
-                            Name = "Property1",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-                            Type = typeof(string),
-                            Name = "Property2",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property3",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property4",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property5",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property6",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-                            Type = typeof(string),
-                            Name = "Property7",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-                            Name = "StaticProperty",
-                            IsStatic = true,
-                            IsNullable = false,
-                            Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property7",
+            PropertyType = typeof(string),
+            DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.PropertySetterTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
index 0920974a6d..a8d111430f 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,197 +9,83 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                    Name = "InheritedTestsFromDifferentProjectTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata_Test.UseRuntimeDataGeneration(testSessionId);
-        var metadata_GenericMethodDataSource__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>
+        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+        Name = "InheritedTestsFromDifferentProjectTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
+        var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
+            "Test", "Test", 9,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_GenericMethodDataSource__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
+            "GenericMethodDataSource", "GenericMethodDataSource", 14,
+            __InvokeTest_GenericMethodDataSource__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("GenericMethodDataSource", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "GenericMethodDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-            TestMethodName = "GenericMethodDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute<global::TUnit.TestProject.TestData>("Foo"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                Name = "GenericMethodDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests).GetMethod("GenericMethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                    Name = "InheritedTestsFromDifferentProjectTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_GenericMethodDataSource__string,
-        };
-        metadata_GenericMethodDataSource__string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_NonGenericMethodDataSource__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
         {
-            TestName = "NonGenericMethodDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-            TestMethodName = "NonGenericMethodDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.TestData), "Foo")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TestData.Foo();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests).GetMethod("GenericMethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute<global::TUnit.TestProject.TestData>("Foo"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_NonGenericMethodDataSource__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
+            "NonGenericMethodDataSource", "NonGenericMethodDataSource", 20,
+            __InvokeTest_NonGenericMethodDataSource__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonGenericMethodDataSource", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests).GetMethod("NonGenericMethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.TestData), "Foo")
             {
-                Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                Name = "NonGenericMethodDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests).GetMethod("NonGenericMethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.TestData.Foo();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                    Name = "InheritedTestsFromDifferentProjectTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonGenericMethodDataSource__string,
-        };
-        metadata_NonGenericMethodDataSource__string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_VerifyInheritedCategoriesAreAvailable = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>
-        {
-            TestName = "VerifyInheritedCategoriesAreAvailable",
-            TestClassType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-            TestMethodName = "VerifyInheritedCategoriesAreAvailable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                Name = "VerifyInheritedCategoriesAreAvailable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                    Name = "InheritedTestsFromDifferentProjectTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_VerifyInheritedCategoriesAreAvailable,
-        };
-        metadata_VerifyInheritedCategoriesAreAvailable.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_VerifyInheritedCategoriesAreAvailable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
+            "VerifyInheritedCategoriesAreAvailable", "VerifyInheritedCategoriesAreAvailable", 26,
+            __InvokeTest_VerifyInheritedCategoriesAreAvailable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("VerifyInheritedCategoriesAreAvailable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test, metadata_GenericMethodDataSource__string, metadata_NonGenericMethodDataSource__string, metadata_VerifyInheritedCategoriesAreAvailable };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -340,209 +226,131 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>
-        {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                    Name = "InheritedTestsFromDifferentProjectTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+    Name = "InheritedTestsFromDifferentProjectTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
+            "Test", "Test", 9,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_GenericMethodDataSource__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>
-        {
-            TestName = "GenericMethodDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-            TestMethodName = "GenericMethodDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute<global::TUnit.TestProject.TestData>("Foo"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                Name = "GenericMethodDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests).GetMethod("GenericMethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                    Name = "InheritedTestsFromDifferentProjectTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_GenericMethodDataSource__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+    Name = "InheritedTestsFromDifferentProjectTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
+            "GenericMethodDataSource", "GenericMethodDataSource", 14,
+            __InvokeTest_GenericMethodDataSource__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("GenericMethodDataSource", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests).GetMethod("GenericMethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute<global::TUnit.TestProject.TestData>("Foo"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonGenericMethodDataSource__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+    Name = "InheritedTestsFromDifferentProjectTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
+            "NonGenericMethodDataSource", "NonGenericMethodDataSource", 20,
+            __InvokeTest_NonGenericMethodDataSource__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NonGenericMethodDataSource", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests).GetMethod("NonGenericMethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.TestData), "Foo")
         {
-            TestName = "NonGenericMethodDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-            TestMethodName = "NonGenericMethodDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.TestData), "Foo")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TestData.Foo();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                Name = "NonGenericMethodDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests).GetMethod("NonGenericMethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                    Name = "InheritedTestsFromDifferentProjectTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NonGenericMethodDataSource__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.TestData.Foo();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_VerifyInheritedCategoriesAreAvailable(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>
-        {
-            TestName = "VerifyInheritedCategoriesAreAvailable",
-            TestClassType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-            TestMethodName = "VerifyInheritedCategoriesAreAvailable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                Name = "VerifyInheritedCategoriesAreAvailable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-                    Name = "InheritedTestsFromDifferentProjectTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_VerifyInheritedCategoriesAreAvailable,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+    Name = "InheritedTestsFromDifferentProjectTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
+            "VerifyInheritedCategoriesAreAvailable", "VerifyInheritedCategoriesAreAvailable", 26,
+            __InvokeTest_VerifyInheritedCategoriesAreAvailable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("VerifyInheritedCategoriesAreAvailable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
index d57491ee7e..de8866edfc 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_SecondTest = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AbstractTests.ConcreteClass2>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "SecondTest",
-            TestClassType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-            TestMethodName = "SecondTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                Name = "SecondTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                    Name = "ConcreteClass2",
-                    Namespace = "TUnit.TestProject.AbstractTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SecondTest,
-        };
-        metadata_SecondTest.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+        Name = "ConcreteClass2",
+        Namespace = "TUnit.TestProject.AbstractTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
+        var metadata_SecondTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
+            "SecondTest", "SecondTest", 11,
+            __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_SecondTest };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -91,45 +71,25 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SecondTest(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AbstractTests.ConcreteClass2>
-        {
-            TestName = "SecondTest",
-            TestClassType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-            TestMethodName = "SecondTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                Name = "SecondTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-                    Name = "ConcreteClass2",
-                    Namespace = "TUnit.TestProject.AbstractTests",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SecondTest,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+    Name = "ConcreteClass2",
+    Namespace = "TUnit.TestProject.AbstractTests",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
+            "SecondTest", "SecondTest", 11,
+            __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AbstractTests.ConcreteClass2 CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
index c2c98160ad..f267ed8a9e 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -13,99 +13,63 @@ internal static class TUnit_TestProject_Bugs__1924_None_BaseClass__TestSource
     #endif
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1924.None.BaseClass>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1924.None.BaseClass", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = new global::TUnit.Core.PropertyDataSource[]
-            {
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Data",
-                    PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1924.DataClass>(),
-                },
-            },
-            PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-            {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Data",
-                    PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
+        Name = "BaseClass",
+        Namespace = "TUnit.TestProject.Bugs._1924.None",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
+        Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+        Name = "Data",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass);
+        var metadata_Test__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1924.None.BaseClass>(
+            "Test", "Test", 11,
+            __InvokeTest_Test__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+            new global::TUnit.Core.ArgumentsAttribute(2),
+            new global::TUnit.Core.ArgumentsAttribute(3),
+        },
+            propertyDataSources: new global::TUnit.Core.PropertyDataSource[]
+        {
+            new global::TUnit.Core.PropertyDataSource
             {
-                Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1924.None.BaseClass", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
-                    Name = "BaseClass",
-                    Namespace = "TUnit.TestProject.Bugs._1924.None",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
-                            Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-                            Name = "Data",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
+                PropertyName = "Data",
+                PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+                DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1924.DataClass>(),
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test__int,
-            RepeatCount = 10,
-        };
-        metadata_Test__int.UseRuntimeDataGeneration(testSessionId);
+        },
+            repeatCount: 10,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test__int };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -156,99 +120,63 @@ internal static class TUnit_TestProject_Bugs__1924_None_BaseClass__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1924.None.BaseClass>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1924.None.BaseClass", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
+    Name = "BaseClass",
+    Namespace = "TUnit.TestProject.Bugs._1924.None",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
+    Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+    Name = "Data",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1924.None.BaseClass>(
+            "Test", "Test", 11,
+            __InvokeTest_Test__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+        new global::TUnit.Core.ArgumentsAttribute(2),
+        new global::TUnit.Core.ArgumentsAttribute(3),
+    },
+            propertyDataSources: new global::TUnit.Core.PropertyDataSource[]
+    {
+        new global::TUnit.Core.PropertyDataSource
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = new global::TUnit.Core.PropertyDataSource[]
-            {
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Data",
-                    PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1924.DataClass>(),
-                },
-            },
-            PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-            {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Data",
-                    PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 11,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1924.None.BaseClass", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
-                    Name = "BaseClass",
-                    Namespace = "TUnit.TestProject.Bugs._1924.None",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
-                            Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-                            Name = "Data",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test__int,
-            RepeatCount = 10,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+            PropertyName = "Data",
+            PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+            DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1924.DataClass>(),
+        },
+    },
+            repeatCount: 10,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1924.None.BaseClass CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
index b31fc7bb71..60f5ba6fd7 100644
--- a/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,54 +9,34 @@ internal static class TUnit_TestProject_Bugs__Issue2887_ActualTestClass__TestSou
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
-                    Name = "ActualTestClass",
-                    Namespace = "TUnit.TestProject.Bugs._Issue2887",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
-                        {
-                            Name = "serviceProvider",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
+        Name = "ActualTestClass",
+        Namespace = "TUnit.TestProject.Bugs._Issue2887",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
+        {
+        Name = "serviceProvider",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass>(
+            "Test1", "Test1", 26,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -99,54 +79,34 @@ internal static class TUnit_TestProject_Bugs__Issue2887_ActualTestClass__TestSou
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
-                    Name = "ActualTestClass",
-                    Namespace = "TUnit.TestProject.Bugs._Issue2887",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
-                        {
-                            Name = "serviceProvider",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
+    Name = "ActualTestClass",
+    Namespace = "TUnit.TestProject.Bugs._Issue2887",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
+    {
+    Name = "serviceProvider",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass>(
+            "Test1", "Test1", 26,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
index 927bccc545..bdc964e673 100644
--- a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,760 +9,369 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_MatrixTest_One__string_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata_MatrixTest_One__string_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Two__int_int_int_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata_MatrixTest_Two__int_int_int_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata_MatrixTest_Enum__int_TestEnum_TestEnum_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools__string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata_AutoGenerateBools__string_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_AutoGenerateBools2__string_bool_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata_AutoGenerateBools2__string_bool_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method1__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata_Method1__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Exclusion__int_int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata_Exclusion__int_int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+        {
+        Name = "testEnum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum?))
+        {
+        Name = "testEnum2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "str",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "boolean",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "item2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "flag",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+        {
+        Name = "enum",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1231,808 +840,561 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_One",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_One__string_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_One", "MatrixTest_One", 9,
+            __InvokeTest_MatrixTest_One__string_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_One", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_One", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Two",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Two__int_int_int_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Two", "MatrixTest_Two", 19,
+            __InvokeTest_MatrixTest_Two__int_int_int_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Two", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Two", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int), typeof(bool) }, null)!.GetParameters()[3]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixTest_Enum",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixTest_Enum",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixTest_Enum",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
-                    {
-                        Name = "testEnum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum?))
-                    {
-                        Name = "testEnum2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixTest_Enum", "MatrixTest_Enum", 30,
+            __InvokeTest_MatrixTest_Enum__int_TestEnum_TestEnum_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest_Enum", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum))
+    {
+    Name = "testEnum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.TestEnum?))
+    {
+    Name = "testEnum2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TestEnum?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixTest_Enum", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::TUnit.TestProject.TestEnum), typeof(global::TUnit.TestProject.TestEnum?) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 40,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools__string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools", "AutoGenerateBools", 40,
+            __InvokeTest_AutoGenerateBools__string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "AutoGenerateBools2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "AutoGenerateBools2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 49,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "AutoGenerateBools2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "str",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_AutoGenerateBools2__string_bool_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "AutoGenerateBools2", "AutoGenerateBools2", 49,
+            __InvokeTest_AutoGenerateBools2__string_bool_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("AutoGenerateBools2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "str",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool?))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("AutoGenerateBools2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(bool?) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ImplicitConversion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ImplicitConversion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ImplicitConversion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ImplicitConversion", "ImplicitConversion", 58,
+            __InvokeTest_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ImplicitConversion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ImplicitConversion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(OneOf<global::TUnit.TestProject.TestEnum, TestEnum2>), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "ExcludingAutoGeneratedMatrixValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "ExcludingAutoGeneratedMatrixValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 67,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "ExcludingAutoGeneratedMatrixValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "boolean",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
+            __InvokeTest_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ExcludingAutoGeneratedMatrixValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "boolean",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("ExcludingAutoGeneratedMatrixValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum), typeof(bool) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method1",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method1__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method1", "Method1", 116,
+            __InvokeTest_Method1__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method1", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 124,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method2", "Method2", 124,
+            __InvokeTest_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 132,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method3", "Method3", 132,
+            __InvokeTest_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 140,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Method4", "Method4", 140,
+            __InvokeTest_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Method4", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "Exclusion",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "Exclusion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 148,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "Exclusion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Exclusion__int_int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "Exclusion", "Exclusion", 148,
+            __InvokeTest_Exclusion__int_int, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Exclusion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "item2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("Exclusion", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MatrixTests>
-        {
-            TestName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            TestClassType = typeof(global::TUnit.TestProject.MatrixTests),
-            TestMethodName = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 197,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MatrixTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                Name = "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "flag",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
-                    {
-                        Name = "enum",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MatrixTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-                    Name = "MatrixTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MatrixTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+    Name = "MatrixTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MatrixTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
+            "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
+            __InvokeTest_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "flag",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum))
+    {
+    Name = "enum",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MatrixTests).GetMethod("MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(global::TUnit.TestProject.MatrixTests.CountToTenEnum) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MatrixTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
index f4e7e393ae..4a0380760c 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,507 +9,302 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_Method__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata_DataSource_Method__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method2__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+        {
+        Name = "action",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata_DataSource_Method2__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method_WithAction__Action = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { 5 },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { 5 };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata_DataSource_Method_WithAction__Action.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method3__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 6, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 6, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata_DataSource_Method3__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_Method4__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
-        {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Arguments = new object[] { "Hello World!", 8, true },
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    // Capture Arguments from the attribute
+                    var arguments = new object[] { "Hello World!", 8, true };
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata_DataSource_Method4__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSource_WithBaseReturn__BaseValue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata_DataSource_WithBaseReturn__BaseValue.UseRuntimeDataGeneration(testSessionId);
-        var metadata_EnumerableFuncArrayTest__string__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+        {
+        Name = "strings",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
-                    {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata_EnumerableFuncArrayTest__string__.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -769,531 +564,398 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method", "DataSource_Method", 12,
+            __InvokeTest_DataSource_Method__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method2", "DataSource_Method2", 19,
+            __InvokeTest_DataSource_Method2__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method2",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 19,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method2__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
+            __InvokeTest_DataSource_Method_WithAction__Action, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method_WithAction", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
+    {
+    Name = "action",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
         {
-            TestName = "DataSource_Method_WithAction",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method_WithAction",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method_WithAction",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Action))
-                    {
-                        Name = "action",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Action)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method_WithAction", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Action) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method_WithAction__Action,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeAction();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method3", "DataSource_Method3", 33,
+            __InvokeTest_DataSource_Method3__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method3", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method3",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { 5 },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { 5 };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 33,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { 5 },
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                // Capture Arguments from the attribute
+                var arguments = new object[] { 5 };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method3", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method3__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_Method4", "DataSource_Method4", 42,
+            __InvokeTest_DataSource_Method4__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_Method4", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
         {
-            TestName = "DataSource_Method4",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_Method4",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Arguments = new object[] { "Hello World!", 6, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 6, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 6, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 6, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Arguments = new object[] { "Hello World!", 8, true },
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        // Capture Arguments from the attribute
-                        var arguments = new object[] { "Hello World!", 8, true };
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_Method4",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_Method4", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
+        {
+            Arguments = new object[] { "Hello World!", 8, true },
+            Factory = (dataGeneratorMetadata) =>
+            {
+                // Capture Arguments from the attribute
+                var arguments = new object[] { "Hello World!", 8, true };
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_Method4__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.SomeMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
+            __InvokeTest_DataSource_WithBaseReturn__BaseValue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_WithBaseReturn", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
         {
-            TestName = "DataSource_WithBaseReturn",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "DataSource_WithBaseReturn",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 53,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "DataSource_WithBaseReturn",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("DataSource_WithBaseReturn", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests.BaseValue) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_WithBaseReturn__BaseValue,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.MethodWithBaseReturn();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+    Name = "MethodDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
+            "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
+            __InvokeTest_EnumerableFuncArrayTest__string__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("EnumerableFuncArrayTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+    {
+    Name = "strings",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
         {
-            TestName = "EnumerableFuncArrayTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-            TestMethodName = "EnumerableFuncArrayTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenTests.EnumerableFuncArrayTestData();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 59,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                Name = "EnumerableFuncArrayTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string[]))
+                    else
                     {
-                        Name = "strings",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests).GetMethod("EnumerableFuncArrayTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string[]) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-                    Name = "MethodDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_EnumerableFuncArrayTest__string__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MethodDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
index 17d08c09f6..797f24e33c 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,175 +9,156 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenWithCancellationTo
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_MyTest__int_CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "MyTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
-            TestMethodName = "MyTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
+        Name = "MethodDataSourceDrivenWithCancellationTokenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests);
+        var metadata_MyTest__int_CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests>(
+            "MyTest", "MyTest", 12,
+            __InvokeTest_MyTest__int_CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MyTest", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("T")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("T")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.T();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.T();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("FuncT")
+                    return Factory();
+                }
+            },
+            new global::TUnit.Core.MethodDataSourceAttribute("FuncT")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.FuncT();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.FuncT();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableT")
+                    return Factory();
+                }
+            },
+            new global::TUnit.Core.MethodDataSourceAttribute("EnumerableT")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.EnumerableT();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.EnumerableT();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncT")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        else
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.EnumerableFuncT();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                        return Factory();
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("ArrayT")
+                    return Factory();
+                }
+            },
+            new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncT")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.EnumerableFuncT();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.ArrayT();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("ArrayFuncT")
+                    return Factory();
+                }
+            },
+            new global::TUnit.Core.MethodDataSourceAttribute("ArrayT")
+            {
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.ArrayT();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.ArrayFuncT();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.MethodDataSourceAttribute("ArrayFuncT")
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
-                Name = "MyTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+                        var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.ArrayFuncT();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                        {
+                            foreach (var item in enumerable)
+                            {
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
+                            }
+                        }
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
-                    Name = "MethodDataSourceDrivenWithCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MyTest__int_CancellationToken,
-        };
-        metadata_MyTest__int_CancellationToken.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_MyTest__int_CancellationToken };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -230,175 +211,156 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenWithCancellationTo
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MyTest__int_CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
+    Name = "MethodDataSourceDrivenWithCancellationTokenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests>(
+            "MyTest", "MyTest", 12,
+            __InvokeTest_MyTest__int_CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MyTest", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("T")
+        {
+            Factory = (dataGeneratorMetadata) =>
+            {
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                {
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.T();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("FuncT")
+        {
+            Factory = (dataGeneratorMetadata) =>
+            {
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                {
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.FuncT();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("EnumerableT")
         {
-            TestName = "MyTest",
-            TestClassType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
-            TestMethodName = "MyTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("T")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.EnumerableT();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.T();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("FuncT")
-                {
-                    Factory = (dataGeneratorMetadata) =>
+                    else
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.FuncT();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableT")
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncT")
+        {
+            Factory = (dataGeneratorMetadata) =>
+            {
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.EnumerableFuncT();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.EnumerableT();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncT")
-                {
-                    Factory = (dataGeneratorMetadata) =>
+                    else
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.EnumerableFuncT();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                        }
-                        return Factory();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("ArrayT")
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("ArrayT")
+        {
+            Factory = (dataGeneratorMetadata) =>
+            {
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.ArrayT();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.ArrayT();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-                new global::TUnit.Core.MethodDataSourceAttribute("ArrayFuncT")
-                {
-                    Factory = (dataGeneratorMetadata) =>
+                    else
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.ArrayFuncT();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                        }
-                        return Factory();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+                }
+                return Factory();
+            }
+        },
+        new global::TUnit.Core.MethodDataSourceAttribute("ArrayFuncT")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
-                Name = "MyTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
+                    var result = global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests.ArrayFuncT();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                        foreach (var item in enumerable)
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
+                        }
+                    }
+                    else
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
-                    Name = "MethodDataSourceDrivenWithCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MyTest__int_CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
index b2ff4b69ad..cb927310fd 100644
--- a/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,166 +9,79 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
+        Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
+        Name = "MultipleClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
+        {
+        Name = "inject1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
+        {
+        Name = "inject2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
+        {
+        Name = "inject3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
+        {
+        Name = "inject4",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
+        {
+        Name = "inject5",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
+            "Test1", "Test1", 17,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
         {Shared = new global::TUnit.Core.SharedType[]{global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None},},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-                    Name = "MultipleClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
-                        {
-                            Name = "inject1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
-                        {
-                            Name = "inject2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
-                        {
-                            Name = "inject3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
-                        {
-                            Name = "inject4",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
-                        {
-                            Name = "inject5",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test2 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
+            "Test2", "Test2", 23,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
         {Shared = new global::TUnit.Core.SharedType[]{global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None},},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-                    Name = "MultipleClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
-                        {
-                            Name = "inject1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
-                        {
-                            Name = "inject2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
-                        {
-                            Name = "inject3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
-                        {
-                            Name = "inject4",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
-                        {
-                            Name = "inject5",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata_Test2.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -240,170 +153,132 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
+    Name = "MultipleClassDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
+    {
+    Name = "inject1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
+    {
+    Name = "inject2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
+    {
+    Name = "inject3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
+    {
+    Name = "inject4",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
+    {
+    Name = "inject5",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
+            "Test1", "Test1", 17,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
     {Shared = new global::TUnit.Core.SharedType[]{global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None},},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 17,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-                    Name = "MultipleClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
-                        {
-                            Name = "inject1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
-                        {
-                            Name = "inject2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
-                        {
-                            Name = "inject3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
-                        {
-                            Name = "inject4",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
-                        {
-                            Name = "inject5",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
+    Name = "MultipleClassDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
+    {
+    Name = "inject1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
+    {
+    Name = "inject2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
+    {
+    Name = "inject3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
+    {
+    Name = "inject4",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
+    {
+    Name = "inject5",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
+            "Test2", "Test2", 23,
+            __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
     {Shared = new global::TUnit.Core.SharedType[]{global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None},},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-                    Name = "MultipleClassDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
-                        {
-                            Name = "inject1",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
-                        {
-                            Name = "inject2",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
-                        {
-                            Name = "inject3",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
-                        {
-                            Name = "inject4",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
-                        },
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
-                        {
-                            Name = "inject5",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.MultipleClassDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
index 7b1a67f77c..cc8e648196 100644
--- a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,57 +9,38 @@ internal static class TUnit_TestProject_NameOfArgumentTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_TestName__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NameOfArgumentTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NameOfArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "TestName",
-            TestClassType = typeof(global::TUnit.TestProject.NameOfArgumentTests),
-            TestMethodName = "TestName",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("TestName"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
-                Name = "TestName",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "name",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NameOfArgumentTests).GetMethod("TestName", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NameOfArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
-                    Name = "NameOfArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestName__string,
-        };
-        metadata_TestName__string.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
+        Name = "NameOfArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.NameOfArgumentTests);
+        var metadata_TestName__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NameOfArgumentTests>(
+            "TestName", "TestName", 8,
+            __InvokeTest_TestName__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestName", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "name",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NameOfArgumentTests).GetMethod("TestName", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("TestName"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestName__string };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -109,57 +90,38 @@ internal static class TUnit_TestProject_NameOfArgumentTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestName__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NameOfArgumentTests>
-        {
-            TestName = "TestName",
-            TestClassType = typeof(global::TUnit.TestProject.NameOfArgumentTests),
-            TestMethodName = "TestName",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("TestName"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
-                Name = "TestName",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "name",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NameOfArgumentTests).GetMethod("TestName", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NameOfArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
-                    Name = "NameOfArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestName__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NameOfArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
+    Name = "NameOfArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NameOfArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NameOfArgumentTests>(
+            "TestName", "TestName", 8,
+            __InvokeTest_TestName__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestName", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "name",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NameOfArgumentTests).GetMethod("TestName", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("TestName"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.NameOfArgumentTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
index b30de14dc3..b16c20e099 100644
--- a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,117 +9,67 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test__byte_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NullableByteArgumentTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute((byte) 1),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(byte?))
-                    {
-                        Name = "someByte",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-                    Name = "NullableByteArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test__byte_,
-        };
-        metadata_Test__byte_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test2__byte_byte_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NullableByteArgumentTests>
+        Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
+        Name = "NullableByteArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.NullableByteArgumentTests);
+        var metadata_Test__byte_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
+            "Test", "Test", 8,
+            __InvokeTest_Test__byte_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute((byte) 1, (byte) 1),
-                new global::TUnit.Core.ArgumentsAttribute((byte) 1, null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(byte))
-                    {
-                        Name = "byte1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte), typeof(byte?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(byte?))
-                    {
-                        Name = "byte2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte), typeof(byte?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-                    Name = "NullableByteArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2__byte_byte_,
-        };
-        metadata_Test2__byte_byte_.UseRuntimeDataGeneration(testSessionId);
+        new global::TUnit.Core.ParameterMetadata(typeof(byte?))
+        {
+        Name = "someByte",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte?) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute((byte) 1),
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test2__byte_byte_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
+            "Test2", "Test2", 15,
+            __InvokeTest_Test2__byte_byte_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(byte))
+        {
+        Name = "byte1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte), typeof(byte?) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(byte?))
+        {
+        Name = "byte2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte?)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte), typeof(byte?) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute((byte) 1, (byte) 1),
+            new global::TUnit.Core.ArgumentsAttribute((byte) 1, null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test__byte_, metadata_Test2__byte_byte_ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -205,121 +155,83 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test__byte_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NullableByteArgumentTests>
-        {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute((byte) 1),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(byte?))
-                    {
-                        Name = "someByte",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte?) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-                    Name = "NullableByteArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test__byte_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
+    Name = "NullableByteArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NullableByteArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
+            "Test", "Test", 8,
+            __InvokeTest_Test__byte_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(byte?))
+    {
+    Name = "someByte",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte?) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute((byte) 1),
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2__byte_byte_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NullableByteArgumentTests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute((byte) 1, (byte) 1),
-                new global::TUnit.Core.ArgumentsAttribute((byte) 1, null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(byte))
-                    {
-                        Name = "byte1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte), typeof(byte?) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(byte?))
-                    {
-                        Name = "byte2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte?)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte), typeof(byte?) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-                    Name = "NullableByteArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2__byte_byte_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
+    Name = "NullableByteArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NullableByteArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
+            "Test2", "Test2", 15,
+            __InvokeTest_Test2__byte_byte_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(byte))
+    {
+    Name = "byte1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte), typeof(byte?) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(byte?))
+    {
+    Name = "byte2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(byte?)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NullableByteArgumentTests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(byte), typeof(byte?) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute((byte) 1, (byte) 1),
+        new global::TUnit.Core.ArgumentsAttribute((byte) 1, null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.NullableByteArgumentTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
index 5a4a607cea..edbe8c4f29 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,312 +9,138 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Int__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Int",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Int",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Int",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Int__int,
-        };
-        metadata_Int__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Double__double = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Double",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Double",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Double",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "d",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Double__double,
-        };
-        metadata_Double__double.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Float__float = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Float",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Float",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1f),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 22,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Float",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(float))
-                    {
-                        Name = "f",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Float__float,
-        };
-        metadata_Float__float.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Long__long = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Long",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Long",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 29,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Long",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(long))
-                    {
-                        Name = "l",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Long__long,
-        };
-        metadata_Long__long.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ULong__ulong = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "ULong",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "ULong",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1UL),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "ULong",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(ulong))
-                    {
-                        Name = "l",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ULong__ulong,
-        };
-        metadata_ULong__ulong.UseRuntimeDataGeneration(testSessionId);
-        var metadata_UInt__uint = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "UInt",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "UInt",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1U),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 43,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "UInt",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(uint))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_UInt__uint,
-        };
-        metadata_UInt__uint.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata_Int__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Int", "Int", 8,
+            __InvokeTest_Int__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Int", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Double__double = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Double", "Double", 15,
+            __InvokeTest_Double__double, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Double", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(double))
+        {
+        Name = "d",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1.1),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Float__float = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Float", "Float", 22,
+            __InvokeTest_Float__float, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Float", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(float))
+        {
+        Name = "f",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1.1f),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Long__long = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Long", "Long", 29,
+            __InvokeTest_Long__long, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Long", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(long))
+        {
+        Name = "l",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1L),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ULong__ulong = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "ULong", "ULong", 36,
+            __InvokeTest_ULong__ulong, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ULong", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(ulong))
+        {
+        Name = "l",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1UL),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_UInt__uint = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "UInt", "UInt", 43,
+            __InvokeTest_UInt__uint, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("UInt", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(uint))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1U),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Int__int, metadata_Double__double, metadata_Float__float, metadata_Long__long, metadata_ULong__ulong, metadata_UInt__uint };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -540,332 +366,218 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Int__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Int",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Int",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Int",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Int__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Int", "Int", 8,
+            __InvokeTest_Int__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Int", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Double__double(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Double",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Double",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Double",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "d",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Double__double,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Double", "Double", 15,
+            __InvokeTest_Double__double, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Double", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(double))
+    {
+    Name = "d",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1.1),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Float__float(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Float",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Float",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1f),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 22,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Float",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(float))
-                    {
-                        Name = "f",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Float__float,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Float", "Float", 22,
+            __InvokeTest_Float__float, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Float", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(float))
+    {
+    Name = "f",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1.1f),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Long__long(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Long",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Long",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 29,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Long",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(long))
-                    {
-                        Name = "l",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Long__long,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Long", "Long", 29,
+            __InvokeTest_Long__long, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Long", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(long))
+    {
+    Name = "l",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1L),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ULong__ulong(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "ULong",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "ULong",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1UL),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "ULong",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(ulong))
-                    {
-                        Name = "l",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ULong__ulong,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "ULong", "ULong", 36,
+            __InvokeTest_ULong__ulong, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ULong", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(ulong))
+    {
+    Name = "l",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1UL),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_UInt__uint(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "UInt",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "UInt",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1U),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 43,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "UInt",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(uint))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_UInt__uint,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "UInt", "UInt", 43,
+            __InvokeTest_UInt__uint, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("UInt", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(uint))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1U),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.NumberArgumentTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
index 5a4a607cea..edbe8c4f29 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,312 +9,138 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Int__int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Int",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Int",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Int",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Int__int,
-        };
-        metadata_Int__int.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Double__double = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Double",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Double",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Double",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "d",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Double__double,
-        };
-        metadata_Double__double.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Float__float = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Float",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Float",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1f),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 22,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Float",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(float))
-                    {
-                        Name = "f",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Float__float,
-        };
-        metadata_Float__float.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Long__long = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Long",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Long",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 29,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Long",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(long))
-                    {
-                        Name = "l",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Long__long,
-        };
-        metadata_Long__long.UseRuntimeDataGeneration(testSessionId);
-        var metadata_ULong__ulong = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "ULong",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "ULong",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1UL),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "ULong",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(ulong))
-                    {
-                        Name = "l",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ULong__ulong,
-        };
-        metadata_ULong__ulong.UseRuntimeDataGeneration(testSessionId);
-        var metadata_UInt__uint = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "UInt",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "UInt",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1U),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 43,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "UInt",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(uint))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_UInt__uint,
-        };
-        metadata_UInt__uint.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata_Int__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Int", "Int", 8,
+            __InvokeTest_Int__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Int", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Double__double = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Double", "Double", 15,
+            __InvokeTest_Double__double, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Double", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(double))
+        {
+        Name = "d",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1.1),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Float__float = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Float", "Float", 22,
+            __InvokeTest_Float__float, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Float", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(float))
+        {
+        Name = "f",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1.1f),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Long__long = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Long", "Long", 29,
+            __InvokeTest_Long__long, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Long", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(long))
+        {
+        Name = "l",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1L),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_ULong__ulong = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "ULong", "ULong", 36,
+            __InvokeTest_ULong__ulong, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ULong", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(ulong))
+        {
+        Name = "l",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1UL),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_UInt__uint = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "UInt", "UInt", 43,
+            __InvokeTest_UInt__uint, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("UInt", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(uint))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1U),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Int__int, metadata_Double__double, metadata_Float__float, metadata_Long__long, metadata_ULong__ulong, metadata_UInt__uint };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -540,332 +366,218 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Int__int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Int",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Int",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Int",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Int__int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Int", "Int", 8,
+            __InvokeTest_Int__int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Int", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Int", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Double__double(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Double",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Double",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Double",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "d",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Double__double,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Double", "Double", 15,
+            __InvokeTest_Double__double, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Double", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(double))
+    {
+    Name = "d",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Double", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1.1),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Float__float(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Float",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Float",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1.1f),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 22,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Float",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(float))
-                    {
-                        Name = "f",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Float__float,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Float", "Float", 22,
+            __InvokeTest_Float__float, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Float", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(float))
+    {
+    Name = "f",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Float", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1.1f),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Long__long(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "Long",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "Long",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 29,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "Long",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(long))
-                    {
-                        Name = "l",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Long__long,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "Long", "Long", 29,
+            __InvokeTest_Long__long, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Long", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(long))
+    {
+    Name = "l",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("Long", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1L),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ULong__ulong(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "ULong",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "ULong",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1UL),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "ULong",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(ulong))
-                    {
-                        Name = "l",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_ULong__ulong,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "ULong", "ULong", 36,
+            __InvokeTest_ULong__ulong, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("ULong", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(ulong))
+    {
+    Name = "l",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(ulong)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("ULong", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(ulong) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1UL),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_UInt__uint(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.NumberArgumentTests>
-        {
-            TestName = "UInt",
-            TestClassType = typeof(global::TUnit.TestProject.NumberArgumentTests),
-            TestMethodName = "UInt",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1U),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 43,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                Name = "UInt",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(uint))
-                    {
-                        Name = "i",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-                    Name = "NumberArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_UInt__uint,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+    Name = "NumberArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
+            "UInt", "UInt", 43,
+            __InvokeTest_UInt__uint, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("UInt", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(uint))
+    {
+    Name = "i",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(uint)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.NumberArgumentTests).GetMethod("UInt", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(uint) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1U),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.NumberArgumentTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
index d8aecaed6c..bbb2940887 100644
--- a/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,240 +9,60 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_High_1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "High_1",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "High_1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "High_1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_High_1,
-        };
-        metadata_High_1.UseRuntimeDataGeneration(testSessionId);
-        var metadata_High_2 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "High_2",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "High_2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 18,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "High_2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_High_2,
-        };
-        metadata_High_2.UseRuntimeDataGeneration(testSessionId);
-        var metadata_High_3 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "High_3",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "High_3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 24,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "High_3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_High_3,
-        };
-        metadata_High_3.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Medium_1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "Medium_1",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "Medium_1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "Medium_1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Medium_1,
-        };
-        metadata_Medium_1.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Medium_2 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "Medium_2",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "Medium_2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "Medium_2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Medium_2,
-        };
-        metadata_Medium_2.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Low_1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "Low_1",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "Low_1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_2,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "Low_1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Low_1,
-        };
-        metadata_Low_1.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+        Name = "PriorityFilteringTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
+        var metadata_High_1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "High_1", "High_1", 12,
+            __InvokeTest_High_1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("High_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_High_2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "High_2", "High_2", 18,
+            __InvokeTest_High_2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("High_2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_High_3 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "High_3", "High_3", 24,
+            __InvokeTest_High_3, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("High_3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Medium_1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "Medium_1", "Medium_1", 30,
+            __InvokeTest_Medium_1, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Medium_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Medium_2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "Medium_2", "Medium_2", 36,
+            __InvokeTest_Medium_2, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Medium_2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Low_1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "Low_1", "Low_1", 42,
+            __InvokeTest_Low_1, __CreateAttributes_2, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Low_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_High_1, metadata_High_2, metadata_High_3, metadata_Medium_1, metadata_Medium_2, metadata_Low_1 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -430,260 +250,140 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_High_1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "High_1",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "High_1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 12,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "High_1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_High_1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+    Name = "PriorityFilteringTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "High_1", "High_1", 12,
+            __InvokeTest_High_1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("High_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_High_2(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "High_2",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "High_2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 18,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "High_2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_High_2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+    Name = "PriorityFilteringTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "High_2", "High_2", 18,
+            __InvokeTest_High_2, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("High_2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_High_3(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "High_3",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "High_3",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 24,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "High_3",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_High_3,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+    Name = "PriorityFilteringTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "High_3", "High_3", 24,
+            __InvokeTest_High_3, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("High_3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Medium_1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "Medium_1",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "Medium_1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "Medium_1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Medium_1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+    Name = "PriorityFilteringTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "Medium_1", "Medium_1", 30,
+            __InvokeTest_Medium_1, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Medium_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Medium_2(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "Medium_2",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "Medium_2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "Medium_2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Medium_2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+    Name = "PriorityFilteringTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "Medium_2", "Medium_2", 36,
+            __InvokeTest_Medium_2, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Medium_2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Low_1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PriorityFilteringTests>
-        {
-            TestName = "Low_1",
-            TestClassType = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-            TestMethodName = "Low_1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_2,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 42,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                Name = "Low_1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-                    Name = "PriorityFilteringTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Low_1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+    Name = "PriorityFilteringTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
+            "Low_1", "Low_1", 42,
+            __InvokeTest_Low_1, __CreateAttributes_2, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Low_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.PriorityFilteringTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
index c6ee8d9c6b..0a196505af 100644
--- a/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -23,285 +23,168 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     #endif
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PropertySetterTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.PropertySetterTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = new global::TUnit.Core.PropertyDataSource[]
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+        Name = "PropertySetterTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+        Type = typeof(string),
+        Name = "Property1",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+        Type = typeof(string),
+        Name = "Property2",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property3",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property4",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property5",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property6",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+        Type = typeof(string),
+        Name = "Property7",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+        Name = "StaticProperty",
+        IsStatic = true,
+        IsNullable = false,
+        Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
+        var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
+            "Test", "Test", 69,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            propertyDataSources: new global::TUnit.Core.PropertyDataSource[]
+        {
+            new global::TUnit.Core.PropertyDataSource
             {
-                new global::TUnit.Core.PropertyDataSource
+                PropertyName = "Property2",
+                PropertyType = typeof(string),
+                DataSource = new global::TUnit.Core.MethodDataSourceAttribute("MethodData")
                 {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(string),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("MethodData")
+                    Factory = (dataGeneratorMetadata) =>
                     {
-                        Factory = (dataGeneratorMetadata) =>
+                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                         {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.PropertySetterTests.MethodData();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
+                            var result = global::TUnit.TestProject.PropertySetterTests.MethodData();
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>(),
+                        return Factory();
+                    }
                 },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+            },
+            new global::TUnit.Core.PropertyDataSource
+            {
+                PropertyName = "Property3",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>(),
+            },
+            new global::TUnit.Core.PropertyDataSource
+            {
+                PropertyName = "Property4",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
         {Shared = global::TUnit.Core.SharedType.PerTestSession,},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property5",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+            },
+            new global::TUnit.Core.PropertyDataSource
+            {
+                PropertyName = "Property5",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
         {Shared = global::TUnit.Core.SharedType.PerClass,},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property6",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
-        {Shared = global::TUnit.Core.SharedType.Keyed,Key = "Key",},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property7",
-                    PropertyType = typeof(string),
-                    DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
-                },
             },
-            PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
+            new global::TUnit.Core.PropertyDataSource
             {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property5",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property6",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property7",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
+                PropertyName = "Property6",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+        {Shared = global::TUnit.Core.SharedType.Keyed,Key = "Key",},
             },
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 69,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+            new global::TUnit.Core.PropertyDataSource
             {
-                Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-                    Name = "PropertySetterTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-                            Type = typeof(string),
-                            Name = "Property1",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-                            Type = typeof(string),
-                            Name = "Property2",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property3",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property4",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property5",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property6",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-                            Type = typeof(string),
-                            Name = "Property7",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-                            Name = "StaticProperty",
-                            IsStatic = true,
-                            IsNullable = false,
-                            Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
+                PropertyName = "Property7",
+                PropertyType = typeof(string),
+                DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata_Test.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -344,285 +227,168 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.PropertySetterTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+    Name = "PropertySetterTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = new global::TUnit.Core.PropertyMetadata[]
+    {
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+    Type = typeof(string),
+    Name = "Property1",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+    Type = typeof(string),
+    Name = "Property2",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+    Name = "Property3",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+    Name = "Property4",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+    Name = "Property5",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+    Name = "Property6",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+    Type = typeof(string),
+    Name = "Property7",
+    IsStatic = false,
+    IsNullable = false,
+    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    },
+    new global::TUnit.Core.PropertyMetadata
+    {
+    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+    Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+    Name = "StaticProperty",
+    IsStatic = true,
+    IsNullable = false,
+    Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+    ClassMetadata = null!,
+    ContainingTypeMetadata = null!
+    }
+    },
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
+            "Test", "Test", 69,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            propertyDataSources: new global::TUnit.Core.PropertyDataSource[]
+    {
+        new global::TUnit.Core.PropertyDataSource
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.PropertySetterTests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = new global::TUnit.Core.PropertyDataSource[]
+            PropertyName = "Property2",
+            PropertyType = typeof(string),
+            DataSource = new global::TUnit.Core.MethodDataSourceAttribute("MethodData")
             {
-                new global::TUnit.Core.PropertyDataSource
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(string),
-                    DataSource = new global::TUnit.Core.MethodDataSourceAttribute("MethodData")
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Factory = (dataGeneratorMetadata) =>
-                        {
-                            async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                            {
-                                var result = global::TUnit.TestProject.PropertySetterTests.MethodData();
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
-                            return Factory();
-                        }
-                    },
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>(),
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+                        var result = global::TUnit.TestProject.PropertySetterTests.MethodData();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                    }
+                    return Factory();
+                }
+            },
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property3",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>(),
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property4",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
     {Shared = global::TUnit.Core.SharedType.PerTestSession,},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property5",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property5",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
     {Shared = global::TUnit.Core.SharedType.PerClass,},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property6",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property6",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.PropertySetterTests.InnerModel>()
     {Shared = global::TUnit.Core.SharedType.Keyed,Key = "Key",},
-                },
-                new global::TUnit.Core.PropertyDataSource
-                {
-                    PropertyName = "Property7",
-                    PropertyType = typeof(string),
-                    DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
-                },
-            },
-            PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-            {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property5",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property6",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property7",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 69,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-                    Name = "PropertySetterTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = new global::TUnit.Core.PropertyMetadata[]
-                    {
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-                            Type = typeof(string),
-                            Name = "Property1",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-                            Type = typeof(string),
-                            Name = "Property2",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property3",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property4",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property5",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                            Name = "Property6",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-                            Type = typeof(string),
-                            Name = "Property7",
-                            IsStatic = false,
-                            IsNullable = false,
-                            Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        },
-                        new global::TUnit.Core.PropertyMetadata
-                        {
-                            ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-                            Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-                            Name = "StaticProperty",
-                            IsStatic = true,
-                            IsNullable = false,
-                            Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-                            ClassMetadata = null!,
-                            ContainingTypeMetadata = null!
-                        }
-                    },
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        },
+        new global::TUnit.Core.PropertyDataSource
+        {
+            PropertyName = "Property7",
+            PropertyType = typeof(string),
+            DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.PropertySetterTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
index 9ecfe3bd87..436b686e22 100644
--- a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,86 +9,34 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_TestWithAssemblyRepeat = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AssemblyRepeatTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "TestWithAssemblyRepeat",
-            TestClassType = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-            TestMethodName = "TestWithAssemblyRepeat",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-                Name = "TestWithAssemblyRepeat",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-                    Name = "AssemblyRepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithAssemblyRepeat,
-            RepeatCount = 3,
-        };
-        metadata_TestWithAssemblyRepeat.UseRuntimeDataGeneration(testSessionId);
-        var metadata_TestWithMethodRepeatOverride = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AssemblyRepeatTests>
-        {
-            TestName = "TestWithMethodRepeatOverride",
-            TestClassType = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-            TestMethodName = "TestWithMethodRepeatOverride",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-                Name = "TestWithMethodRepeatOverride",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-                    Name = "AssemblyRepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithMethodRepeatOverride,
-            RepeatCount = 1,
-        };
-        metadata_TestWithMethodRepeatOverride.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
+        Name = "AssemblyRepeatTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AssemblyRepeatTests);
+        var metadata_TestWithAssemblyRepeat = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
+            "TestWithAssemblyRepeat", "TestWithAssemblyRepeat", 9,
+            __InvokeTest_TestWithAssemblyRepeat, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithAssemblyRepeat", __classType, typeof(void), __classMetadata),
+            repeatCount: 3,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_TestWithMethodRepeatOverride = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
+            "TestWithMethodRepeatOverride", "TestWithMethodRepeatOverride", 14,
+            __InvokeTest_TestWithMethodRepeatOverride, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithMethodRepeatOverride", __classType, typeof(void), __classMetadata),
+            repeatCount: 1,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithAssemblyRepeat, metadata_TestWithMethodRepeatOverride };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -167,90 +115,50 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithAssemblyRepeat(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AssemblyRepeatTests>
-        {
-            TestName = "TestWithAssemblyRepeat",
-            TestClassType = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-            TestMethodName = "TestWithAssemblyRepeat",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-                Name = "TestWithAssemblyRepeat",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-                    Name = "AssemblyRepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithAssemblyRepeat,
-            RepeatCount = 3,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
+    Name = "AssemblyRepeatTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AssemblyRepeatTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
+            "TestWithAssemblyRepeat", "TestWithAssemblyRepeat", 9,
+            __InvokeTest_TestWithAssemblyRepeat, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithAssemblyRepeat", __classType, typeof(void), __classMetadata),
+            repeatCount: 3,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithMethodRepeatOverride(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AssemblyRepeatTests>
-        {
-            TestName = "TestWithMethodRepeatOverride",
-            TestClassType = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-            TestMethodName = "TestWithMethodRepeatOverride",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-                Name = "TestWithMethodRepeatOverride",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-                    Name = "AssemblyRepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithMethodRepeatOverride,
-            RepeatCount = 1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
+    Name = "AssemblyRepeatTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AssemblyRepeatTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
+            "TestWithMethodRepeatOverride", "TestWithMethodRepeatOverride", 14,
+            __InvokeTest_TestWithMethodRepeatOverride, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithMethodRepeatOverride", __classType, typeof(void), __classMetadata),
+            repeatCount: 1,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AssemblyRepeatTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
index 3bc3cbd23d..aae9f90ed9 100644
--- a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,126 +9,42 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_One = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.RepeatTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "One",
-            TestClassType = typeof(global::TUnit.TestProject.RepeatTests),
-            TestMethodName = "One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.RepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                Name = "One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.RepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                    Name = "RepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_One,
-            RepeatCount = 1,
-        };
-        metadata_One.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Two = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.RepeatTests>
-        {
-            TestName = "Two",
-            TestClassType = typeof(global::TUnit.TestProject.RepeatTests),
-            TestMethodName = "Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.RepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                Name = "Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.RepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                    Name = "RepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Two,
-            RepeatCount = 2,
-        };
-        metadata_Two.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Three = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.RepeatTests>
-        {
-            TestName = "Three",
-            TestClassType = typeof(global::TUnit.TestProject.RepeatTests),
-            TestMethodName = "Three",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_2,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.RepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                Name = "Three",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.RepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                    Name = "RepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Three,
-            RepeatCount = 3,
-        };
-        metadata_Three.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.RepeatTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+        Name = "RepeatTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.RepeatTests);
+        var metadata_One = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
+            "One", "One", 9,
+            __InvokeTest_One, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("One", __classType, typeof(void), __classMetadata),
+            repeatCount: 1,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Two = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
+            "Two", "Two", 16,
+            __InvokeTest_Two, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Two", __classType, typeof(void), __classMetadata),
+            repeatCount: 2,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Three = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
+            "Three", "Three", 23,
+            __InvokeTest_Three, __CreateAttributes_2, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Three", __classType, typeof(void), __classMetadata),
+            repeatCount: 3,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_One, metadata_Two, metadata_Three };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -246,134 +162,74 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_One(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.RepeatTests>
-        {
-            TestName = "One",
-            TestClassType = typeof(global::TUnit.TestProject.RepeatTests),
-            TestMethodName = "One",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.RepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                Name = "One",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.RepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                    Name = "RepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_One,
-            RepeatCount = 1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.RepeatTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+    Name = "RepeatTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.RepeatTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
+            "One", "One", 9,
+            __InvokeTest_One, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("One", __classType, typeof(void), __classMetadata),
+            repeatCount: 1,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Two(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.RepeatTests>
-        {
-            TestName = "Two",
-            TestClassType = typeof(global::TUnit.TestProject.RepeatTests),
-            TestMethodName = "Two",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.RepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                Name = "Two",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.RepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                    Name = "RepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Two,
-            RepeatCount = 2,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.RepeatTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+    Name = "RepeatTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.RepeatTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
+            "Two", "Two", 16,
+            __InvokeTest_Two, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Two", __classType, typeof(void), __classMetadata),
+            repeatCount: 2,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Three(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.RepeatTests>
-        {
-            TestName = "Three",
-            TestClassType = typeof(global::TUnit.TestProject.RepeatTests),
-            TestMethodName = "Three",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_2,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 23,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.RepeatTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                Name = "Three",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.RepeatTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-                    Name = "RepeatTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Three,
-            RepeatCount = 3,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.RepeatTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+    Name = "RepeatTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.RepeatTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
+            "Three", "Three", 23,
+            __InvokeTest_Three, __CreateAttributes_2, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Three", __classType, typeof(void), __classMetadata),
+            repeatCount: 3,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.RepeatTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
index cf70a58826..992fcd29de 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
@@ -9,606 +9,138 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_With_STA = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "With_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "With_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "With_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_With_STA,
-            RepeatCount = 100,
-        };
-        metadata_With_STA.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Without_STA = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "Without_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "Without_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "Without_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Without_STA,
-            RepeatCount = 100,
-        };
-        metadata_Without_STA.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithSimpleAwait = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithSimpleAwait",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithSimpleAwait",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithSimpleAwait",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithSimpleAwait,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithSimpleAwait.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskYield = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskYield",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskYield",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskYield",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskYield,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskYield.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithConfigureAwaitTrue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithConfigureAwaitTrue",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithConfigureAwaitTrue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithConfigureAwaitTrue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithConfigureAwaitTrue,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithConfigureAwaitTrue.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithNestedAsyncCalls = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithNestedAsyncCalls",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithNestedAsyncCalls",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 54,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithNestedAsyncCalls",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithNestedAsyncCalls,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithNestedAsyncCalls.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskFromResult = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskFromResult",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskFromResult",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskFromResult",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskFromResult,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskFromResult.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithCompletedTask = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithCompletedTask",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithCompletedTask",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 74,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithCompletedTask",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithCompletedTask,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithCompletedTask.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskRun = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskRun",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskRun",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 83,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskRun",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskRun,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskRun.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithMultipleAwaits = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithMultipleAwaits",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithMultipleAwaits",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithMultipleAwaits",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithMultipleAwaits,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithMultipleAwaits.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithAsyncEnumerable = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithAsyncEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithAsyncEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithAsyncEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithAsyncEnumerable,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithAsyncEnumerable.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskWhenAll = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskWhenAll",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskWhenAll",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 130,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskWhenAll",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskWhenAll,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskWhenAll.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithExceptionHandling = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithExceptionHandling",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithExceptionHandling",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 147,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithExceptionHandling",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithExceptionHandling,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithExceptionHandling.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithThrowsNothingAssertion = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithThrowsNothingAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithThrowsNothingAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 194,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithThrowsNothingAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithThrowsNothingAssertion,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithThrowsNothingAssertion.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithFuncAssertion = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithFuncAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithFuncAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 211,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithFuncAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithFuncAssertion,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithFuncAssertion.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata_With_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "With_STA", "With_STA", 14,
+            __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Without_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "Without_STA", "Without_STA", 20,
+            __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithSimpleAwait = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
+            __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskYield = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskYield", "STA_WithTaskYield", 36,
+            __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithConfigureAwaitTrue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
+            __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithNestedAsyncCalls = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
+            __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskFromResult = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
+            __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithCompletedTask = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
+            __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskRun = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskRun", "STA_WithTaskRun", 83,
+            __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithMultipleAwaits = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
+            __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithAsyncEnumerable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
+            __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskWhenAll = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
+            __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithExceptionHandling = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
+            __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithThrowsNothingAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
+            __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithFuncAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
+            __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_With_STA, metadata_Without_STA, metadata_STA_WithSimpleAwait, metadata_STA_WithTaskYield, metadata_STA_WithConfigureAwaitTrue, metadata_STA_WithNestedAsyncCalls, metadata_STA_WithTaskFromResult, metadata_STA_WithCompletedTask, metadata_STA_WithTaskRun, metadata_STA_WithMultipleAwaits, metadata_STA_WithAsyncEnumerable, metadata_STA_WithTaskWhenAll, metadata_STA_WithExceptionHandling, metadata_STA_WithThrowsNothingAssertion, metadata_STA_WithFuncAssertion };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1029,662 +561,362 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_With_STA(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "With_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "With_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "With_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_With_STA,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "With_STA", "With_STA", 14,
+            __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Without_STA(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "Without_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "Without_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "Without_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Without_STA,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "Without_STA", "Without_STA", 20,
+            __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithSimpleAwait(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithSimpleAwait",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithSimpleAwait",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithSimpleAwait",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithSimpleAwait,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
+            __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskYield(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskYield",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskYield",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskYield",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskYield,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskYield", "STA_WithTaskYield", 36,
+            __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithConfigureAwaitTrue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithConfigureAwaitTrue",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithConfigureAwaitTrue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithConfigureAwaitTrue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithConfigureAwaitTrue,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
+            __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithNestedAsyncCalls(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithNestedAsyncCalls",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithNestedAsyncCalls",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 54,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithNestedAsyncCalls",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithNestedAsyncCalls,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
+            __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskFromResult(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskFromResult",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskFromResult",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskFromResult",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskFromResult,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
+            __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithCompletedTask(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithCompletedTask",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithCompletedTask",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 74,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithCompletedTask",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithCompletedTask,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
+            __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskRun(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskRun",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskRun",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 83,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskRun",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskRun,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskRun", "STA_WithTaskRun", 83,
+            __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithMultipleAwaits(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithMultipleAwaits",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithMultipleAwaits",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithMultipleAwaits",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithMultipleAwaits,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
+            __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithAsyncEnumerable(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithAsyncEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithAsyncEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithAsyncEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithAsyncEnumerable,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
+            __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskWhenAll(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskWhenAll",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskWhenAll",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 130,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskWhenAll",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskWhenAll,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
+            __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithExceptionHandling(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithExceptionHandling",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithExceptionHandling",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 147,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithExceptionHandling",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithExceptionHandling,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
+            __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithThrowsNothingAssertion(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithThrowsNothingAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithThrowsNothingAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 194,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithThrowsNothingAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithThrowsNothingAssertion,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
+            __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithFuncAssertion(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithFuncAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithFuncAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 211,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithFuncAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithFuncAssertion,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
+            __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.STAThreadTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
index cf70a58826..992fcd29de 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
@@ -9,606 +9,138 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_With_STA = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "With_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "With_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "With_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_With_STA,
-            RepeatCount = 100,
-        };
-        metadata_With_STA.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Without_STA = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "Without_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "Without_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "Without_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Without_STA,
-            RepeatCount = 100,
-        };
-        metadata_Without_STA.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithSimpleAwait = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithSimpleAwait",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithSimpleAwait",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithSimpleAwait",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithSimpleAwait,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithSimpleAwait.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskYield = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskYield",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskYield",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskYield",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskYield,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskYield.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithConfigureAwaitTrue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithConfigureAwaitTrue",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithConfigureAwaitTrue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithConfigureAwaitTrue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithConfigureAwaitTrue,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithConfigureAwaitTrue.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithNestedAsyncCalls = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithNestedAsyncCalls",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithNestedAsyncCalls",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 54,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithNestedAsyncCalls",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithNestedAsyncCalls,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithNestedAsyncCalls.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskFromResult = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskFromResult",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskFromResult",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskFromResult",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskFromResult,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskFromResult.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithCompletedTask = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithCompletedTask",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithCompletedTask",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 74,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithCompletedTask",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithCompletedTask,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithCompletedTask.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskRun = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskRun",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskRun",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 83,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskRun",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskRun,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskRun.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithMultipleAwaits = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithMultipleAwaits",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithMultipleAwaits",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithMultipleAwaits",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithMultipleAwaits,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithMultipleAwaits.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithAsyncEnumerable = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithAsyncEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithAsyncEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithAsyncEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithAsyncEnumerable,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithAsyncEnumerable.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskWhenAll = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskWhenAll",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskWhenAll",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 130,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskWhenAll",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskWhenAll,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskWhenAll.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithExceptionHandling = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithExceptionHandling",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithExceptionHandling",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 147,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithExceptionHandling",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithExceptionHandling,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithExceptionHandling.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithThrowsNothingAssertion = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithThrowsNothingAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithThrowsNothingAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 194,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithThrowsNothingAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithThrowsNothingAssertion,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithThrowsNothingAssertion.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithFuncAssertion = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithFuncAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithFuncAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 211,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithFuncAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithFuncAssertion,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithFuncAssertion.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata_With_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "With_STA", "With_STA", 14,
+            __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Without_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "Without_STA", "Without_STA", 20,
+            __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithSimpleAwait = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
+            __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskYield = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskYield", "STA_WithTaskYield", 36,
+            __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithConfigureAwaitTrue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
+            __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithNestedAsyncCalls = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
+            __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskFromResult = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
+            __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithCompletedTask = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
+            __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskRun = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskRun", "STA_WithTaskRun", 83,
+            __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithMultipleAwaits = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
+            __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithAsyncEnumerable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
+            __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskWhenAll = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
+            __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithExceptionHandling = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
+            __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithThrowsNothingAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
+            __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithFuncAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
+            __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_With_STA, metadata_Without_STA, metadata_STA_WithSimpleAwait, metadata_STA_WithTaskYield, metadata_STA_WithConfigureAwaitTrue, metadata_STA_WithNestedAsyncCalls, metadata_STA_WithTaskFromResult, metadata_STA_WithCompletedTask, metadata_STA_WithTaskRun, metadata_STA_WithMultipleAwaits, metadata_STA_WithAsyncEnumerable, metadata_STA_WithTaskWhenAll, metadata_STA_WithExceptionHandling, metadata_STA_WithThrowsNothingAssertion, metadata_STA_WithFuncAssertion };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1029,662 +561,362 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_With_STA(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "With_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "With_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "With_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_With_STA,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "With_STA", "With_STA", 14,
+            __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Without_STA(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "Without_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "Without_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "Without_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Without_STA,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "Without_STA", "Without_STA", 20,
+            __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithSimpleAwait(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithSimpleAwait",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithSimpleAwait",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithSimpleAwait",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithSimpleAwait,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
+            __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskYield(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskYield",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskYield",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskYield",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskYield,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskYield", "STA_WithTaskYield", 36,
+            __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithConfigureAwaitTrue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithConfigureAwaitTrue",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithConfigureAwaitTrue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithConfigureAwaitTrue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithConfigureAwaitTrue,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
+            __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithNestedAsyncCalls(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithNestedAsyncCalls",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithNestedAsyncCalls",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 54,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithNestedAsyncCalls",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithNestedAsyncCalls,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
+            __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskFromResult(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskFromResult",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskFromResult",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskFromResult",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskFromResult,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
+            __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithCompletedTask(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithCompletedTask",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithCompletedTask",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 74,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithCompletedTask",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithCompletedTask,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
+            __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskRun(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskRun",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskRun",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 83,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskRun",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskRun,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskRun", "STA_WithTaskRun", 83,
+            __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithMultipleAwaits(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithMultipleAwaits",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithMultipleAwaits",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithMultipleAwaits",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithMultipleAwaits,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
+            __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithAsyncEnumerable(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithAsyncEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithAsyncEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithAsyncEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithAsyncEnumerable,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
+            __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskWhenAll(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskWhenAll",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskWhenAll",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 130,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskWhenAll",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskWhenAll,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
+            __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithExceptionHandling(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithExceptionHandling",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithExceptionHandling",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 147,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithExceptionHandling",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithExceptionHandling,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
+            __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithThrowsNothingAssertion(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithThrowsNothingAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithThrowsNothingAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 194,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithThrowsNothingAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithThrowsNothingAssertion,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
+            __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithFuncAssertion(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithFuncAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithFuncAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 211,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithFuncAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithFuncAssertion,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
+            __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.STAThreadTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
index cf70a58826..992fcd29de 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
@@ -9,606 +9,138 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_With_STA = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "With_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "With_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "With_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_With_STA,
-            RepeatCount = 100,
-        };
-        metadata_With_STA.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Without_STA = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "Without_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "Without_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "Without_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Without_STA,
-            RepeatCount = 100,
-        };
-        metadata_Without_STA.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithSimpleAwait = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithSimpleAwait",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithSimpleAwait",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithSimpleAwait",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithSimpleAwait,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithSimpleAwait.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskYield = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskYield",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskYield",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskYield",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskYield,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskYield.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithConfigureAwaitTrue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithConfigureAwaitTrue",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithConfigureAwaitTrue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithConfigureAwaitTrue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithConfigureAwaitTrue,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithConfigureAwaitTrue.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithNestedAsyncCalls = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithNestedAsyncCalls",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithNestedAsyncCalls",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 54,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithNestedAsyncCalls",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithNestedAsyncCalls,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithNestedAsyncCalls.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskFromResult = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskFromResult",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskFromResult",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskFromResult",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskFromResult,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskFromResult.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithCompletedTask = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithCompletedTask",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithCompletedTask",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 74,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithCompletedTask",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithCompletedTask,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithCompletedTask.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskRun = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskRun",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskRun",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 83,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskRun",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskRun,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskRun.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithMultipleAwaits = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithMultipleAwaits",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithMultipleAwaits",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithMultipleAwaits",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithMultipleAwaits,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithMultipleAwaits.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithAsyncEnumerable = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithAsyncEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithAsyncEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithAsyncEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithAsyncEnumerable,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithAsyncEnumerable.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskWhenAll = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskWhenAll",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskWhenAll",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 130,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskWhenAll",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskWhenAll,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskWhenAll.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithExceptionHandling = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithExceptionHandling",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithExceptionHandling",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 147,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithExceptionHandling",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithExceptionHandling,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithExceptionHandling.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithThrowsNothingAssertion = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithThrowsNothingAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithThrowsNothingAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 194,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithThrowsNothingAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithThrowsNothingAssertion,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithThrowsNothingAssertion.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithFuncAssertion = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithFuncAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithFuncAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 211,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithFuncAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithFuncAssertion,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithFuncAssertion.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata_With_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "With_STA", "With_STA", 14,
+            __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Without_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "Without_STA", "Without_STA", 20,
+            __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithSimpleAwait = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
+            __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskYield = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskYield", "STA_WithTaskYield", 36,
+            __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithConfigureAwaitTrue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
+            __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithNestedAsyncCalls = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
+            __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskFromResult = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
+            __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithCompletedTask = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
+            __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskRun = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskRun", "STA_WithTaskRun", 83,
+            __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithMultipleAwaits = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
+            __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithAsyncEnumerable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
+            __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskWhenAll = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
+            __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithExceptionHandling = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
+            __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithThrowsNothingAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
+            __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithFuncAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
+            __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_With_STA, metadata_Without_STA, metadata_STA_WithSimpleAwait, metadata_STA_WithTaskYield, metadata_STA_WithConfigureAwaitTrue, metadata_STA_WithNestedAsyncCalls, metadata_STA_WithTaskFromResult, metadata_STA_WithCompletedTask, metadata_STA_WithTaskRun, metadata_STA_WithMultipleAwaits, metadata_STA_WithAsyncEnumerable, metadata_STA_WithTaskWhenAll, metadata_STA_WithExceptionHandling, metadata_STA_WithThrowsNothingAssertion, metadata_STA_WithFuncAssertion };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1029,662 +561,362 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_With_STA(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "With_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "With_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "With_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_With_STA,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "With_STA", "With_STA", 14,
+            __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Without_STA(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "Without_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "Without_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "Without_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Without_STA,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "Without_STA", "Without_STA", 20,
+            __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithSimpleAwait(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithSimpleAwait",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithSimpleAwait",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithSimpleAwait",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithSimpleAwait,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
+            __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskYield(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskYield",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskYield",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskYield",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskYield,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskYield", "STA_WithTaskYield", 36,
+            __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithConfigureAwaitTrue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithConfigureAwaitTrue",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithConfigureAwaitTrue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithConfigureAwaitTrue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithConfigureAwaitTrue,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
+            __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithNestedAsyncCalls(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithNestedAsyncCalls",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithNestedAsyncCalls",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 54,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithNestedAsyncCalls",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithNestedAsyncCalls,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
+            __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskFromResult(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskFromResult",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskFromResult",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskFromResult",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskFromResult,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
+            __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithCompletedTask(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithCompletedTask",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithCompletedTask",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 74,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithCompletedTask",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithCompletedTask,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
+            __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskRun(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskRun",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskRun",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 83,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskRun",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskRun,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskRun", "STA_WithTaskRun", 83,
+            __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithMultipleAwaits(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithMultipleAwaits",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithMultipleAwaits",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithMultipleAwaits",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithMultipleAwaits,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
+            __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithAsyncEnumerable(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithAsyncEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithAsyncEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithAsyncEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithAsyncEnumerable,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
+            __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskWhenAll(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskWhenAll",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskWhenAll",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 130,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskWhenAll",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskWhenAll,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
+            __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithExceptionHandling(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithExceptionHandling",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithExceptionHandling",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 147,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithExceptionHandling",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithExceptionHandling,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
+            __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithThrowsNothingAssertion(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithThrowsNothingAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithThrowsNothingAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 194,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithThrowsNothingAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithThrowsNothingAssertion,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
+            __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithFuncAssertion(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithFuncAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithFuncAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 211,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithFuncAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithFuncAssertion,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
+            __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.STAThreadTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
index d4a8fe25d4..80d3839a7b 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
@@ -9,606 +9,138 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_With_STA = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "With_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "With_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "With_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_With_STA,
-            RepeatCount = 100,
-        };
-        metadata_With_STA.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Without_STA = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "Without_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "Without_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "Without_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Without_STA,
-            RepeatCount = 100,
-        };
-        metadata_Without_STA.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithSimpleAwait = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithSimpleAwait",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithSimpleAwait",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithSimpleAwait",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithSimpleAwait,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithSimpleAwait.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskYield = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskYield",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskYield",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskYield",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskYield,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskYield.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithConfigureAwaitTrue = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithConfigureAwaitTrue",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithConfigureAwaitTrue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithConfigureAwaitTrue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithConfigureAwaitTrue,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithConfigureAwaitTrue.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithNestedAsyncCalls = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithNestedAsyncCalls",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithNestedAsyncCalls",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 54,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithNestedAsyncCalls",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithNestedAsyncCalls,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithNestedAsyncCalls.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskFromResult = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskFromResult",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskFromResult",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskFromResult",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskFromResult,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskFromResult.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithCompletedTask = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithCompletedTask",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithCompletedTask",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 74,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithCompletedTask",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithCompletedTask,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithCompletedTask.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskRun = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskRun",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskRun",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 83,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskRun",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskRun,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskRun.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithMultipleAwaits = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithMultipleAwaits",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithMultipleAwaits",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithMultipleAwaits",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithMultipleAwaits,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithMultipleAwaits.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithAsyncEnumerable = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithAsyncEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithAsyncEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithAsyncEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithAsyncEnumerable,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithAsyncEnumerable.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithTaskWhenAll = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskWhenAll",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskWhenAll",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 130,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskWhenAll",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskWhenAll,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithTaskWhenAll.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithExceptionHandling = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithExceptionHandling",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithExceptionHandling",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 147,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithExceptionHandling",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithExceptionHandling,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithExceptionHandling.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithThrowsNothingAssertion = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithThrowsNothingAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithThrowsNothingAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 194,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithThrowsNothingAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithThrowsNothingAssertion,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithThrowsNothingAssertion.UseRuntimeDataGeneration(testSessionId);
-        var metadata_STA_WithFuncAssertion = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithFuncAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithFuncAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 211,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithFuncAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithFuncAssertion,
-            RepeatCount = 100,
-        };
-        metadata_STA_WithFuncAssertion.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata_With_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "With_STA", "With_STA", 14,
+            __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Without_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "Without_STA", "Without_STA", 20,
+            __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithSimpleAwait = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
+            __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskYield = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskYield", "STA_WithTaskYield", 36,
+            __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithConfigureAwaitTrue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
+            __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithNestedAsyncCalls = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
+            __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskFromResult = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
+            __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithCompletedTask = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
+            __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskRun = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskRun", "STA_WithTaskRun", 83,
+            __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithMultipleAwaits = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
+            __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithAsyncEnumerable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
+            __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithTaskWhenAll = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
+            __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithExceptionHandling = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
+            __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithThrowsNothingAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
+            __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_STA_WithFuncAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
+            __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_With_STA, metadata_Without_STA, metadata_STA_WithSimpleAwait, metadata_STA_WithTaskYield, metadata_STA_WithConfigureAwaitTrue, metadata_STA_WithNestedAsyncCalls, metadata_STA_WithTaskFromResult, metadata_STA_WithCompletedTask, metadata_STA_WithTaskRun, metadata_STA_WithMultipleAwaits, metadata_STA_WithAsyncEnumerable, metadata_STA_WithTaskWhenAll, metadata_STA_WithExceptionHandling, metadata_STA_WithThrowsNothingAssertion, metadata_STA_WithFuncAssertion };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1029,662 +561,362 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_With_STA(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "With_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "With_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "With_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_With_STA,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "With_STA", "With_STA", 14,
+            __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Without_STA(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "Without_STA",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "Without_STA",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 20,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "Without_STA",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Without_STA,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "Without_STA", "Without_STA", 20,
+            __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithSimpleAwait(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithSimpleAwait",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithSimpleAwait",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithSimpleAwait",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithSimpleAwait,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
+            __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskYield(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskYield",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskYield",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 36,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskYield",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskYield,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskYield", "STA_WithTaskYield", 36,
+            __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithConfigureAwaitTrue(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithConfigureAwaitTrue",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithConfigureAwaitTrue",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 45,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithConfigureAwaitTrue",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithConfigureAwaitTrue,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
+            __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithNestedAsyncCalls(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithNestedAsyncCalls",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithNestedAsyncCalls",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 54,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithNestedAsyncCalls",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithNestedAsyncCalls,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
+            __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskFromResult(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskFromResult",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskFromResult",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 64,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskFromResult",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskFromResult,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
+            __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithCompletedTask(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithCompletedTask",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithCompletedTask",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 74,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithCompletedTask",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithCompletedTask,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
+            __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskRun(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskRun",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskRun",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 83,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskRun",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskRun,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskRun", "STA_WithTaskRun", 83,
+            __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithMultipleAwaits(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithMultipleAwaits",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithMultipleAwaits",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 98,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithMultipleAwaits",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithMultipleAwaits,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
+            __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithAsyncEnumerable(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithAsyncEnumerable",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithAsyncEnumerable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 116,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithAsyncEnumerable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithAsyncEnumerable,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
+            __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskWhenAll(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithTaskWhenAll",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithTaskWhenAll",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 130,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithTaskWhenAll",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithTaskWhenAll,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
+            __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithExceptionHandling(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithExceptionHandling",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithExceptionHandling",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 147,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithExceptionHandling",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithExceptionHandling,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
+            __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithThrowsNothingAssertion(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithThrowsNothingAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithThrowsNothingAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 194,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithThrowsNothingAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithThrowsNothingAssertion,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
+            __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithFuncAssertion(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.STAThreadTests>
-        {
-            TestName = "STA_WithFuncAssertion",
-            TestClassType = typeof(global::TUnit.TestProject.STAThreadTests),
-            TestMethodName = "STA_WithFuncAssertion",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 211,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                Name = "STA_WithFuncAssertion",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-                    Name = "STAThreadTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_STA_WithFuncAssertion,
-            RepeatCount = 100,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.STAThreadTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+    Name = "STAThreadTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
+            "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
+            __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            repeatCount: 100,
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.STAThreadTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
index 6aaee3db65..0bae132c66 100644
--- a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,126 +9,76 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Normal__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.StringArgumentTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Normal",
-            TestClassType = typeof(global::TUnit.TestProject.StringArgumentTests),
-            TestMethodName = "Normal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(@"\"),
-                new global::TUnit.Core.ArgumentsAttribute(@"\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute(        """
+        Type = typeof(global::TUnit.TestProject.StringArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
+        Name = "StringArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.StringArgumentTests);
+        var metadata_Normal__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
+            "Normal", "Normal", 8,
+            __InvokeTest_Normal__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Normal", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "s",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.StringArgumentTests).GetMethod("Normal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(""),
+            new global::TUnit.Core.ArgumentsAttribute(@"\"),
+            new global::TUnit.Core.ArgumentsAttribute(@"\t"),
+            new global::TUnit.Core.ArgumentsAttribute("\t"),
+            new global::TUnit.Core.ArgumentsAttribute("\\t"),
+            new global::TUnit.Core.ArgumentsAttribute("\\\t"),
+            new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
+            new global::TUnit.Core.ArgumentsAttribute(        """
                 Hello
                 World
                 """
         ),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-                Name = "Normal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "s",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.StringArgumentTests).GetMethod("Normal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-                    Name = "StringArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Normal__string,
-        };
-        metadata_Normal__string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Nullable__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.StringArgumentTests>
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Nullable__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
+            "Nullable", "Nullable", 27,
+            __InvokeTest_Nullable__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Nullable", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "Nullable",
-            TestClassType = typeof(global::TUnit.TestProject.StringArgumentTests),
-            TestMethodName = "Nullable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(@"\"),
-                new global::TUnit.Core.ArgumentsAttribute(@"\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 27,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-                Name = "Nullable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "s",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.StringArgumentTests).GetMethod("Nullable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-                    Name = "StringArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Nullable__string_,
-        };
-        metadata_Nullable__string_.UseRuntimeDataGeneration(testSessionId);
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "s",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.StringArgumentTests).GetMethod("Nullable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(""),
+            new global::TUnit.Core.ArgumentsAttribute(@"\"),
+            new global::TUnit.Core.ArgumentsAttribute(@"\t"),
+            new global::TUnit.Core.ArgumentsAttribute("\t"),
+            new global::TUnit.Core.ArgumentsAttribute("\\t"),
+            new global::TUnit.Core.ArgumentsAttribute("\\\t"),
+            new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Normal__string, metadata_Nullable__string_ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -214,130 +164,92 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Normal__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.StringArgumentTests>
-        {
-            TestName = "Normal",
-            TestClassType = typeof(global::TUnit.TestProject.StringArgumentTests),
-            TestMethodName = "Normal",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(@"\"),
-                new global::TUnit.Core.ArgumentsAttribute(@"\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute(        """
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.StringArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
+    Name = "StringArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.StringArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
+            "Normal", "Normal", 8,
+            __InvokeTest_Normal__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Normal", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "s",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.StringArgumentTests).GetMethod("Normal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(""),
+        new global::TUnit.Core.ArgumentsAttribute(@"\"),
+        new global::TUnit.Core.ArgumentsAttribute(@"\t"),
+        new global::TUnit.Core.ArgumentsAttribute("\t"),
+        new global::TUnit.Core.ArgumentsAttribute("\\t"),
+        new global::TUnit.Core.ArgumentsAttribute("\\\t"),
+        new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
+        new global::TUnit.Core.ArgumentsAttribute(        """
             Hello
             World
             """
     ),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-                Name = "Normal",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "s",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.StringArgumentTests).GetMethod("Normal", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-                    Name = "StringArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Normal__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Nullable__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.StringArgumentTests>
-        {
-            TestName = "Nullable",
-            TestClassType = typeof(global::TUnit.TestProject.StringArgumentTests),
-            TestMethodName = "Nullable",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(@"\"),
-                new global::TUnit.Core.ArgumentsAttribute(@"\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 27,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-                Name = "Nullable",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "s",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.StringArgumentTests).GetMethod("Nullable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-                    Name = "StringArgumentTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Nullable__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.StringArgumentTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
+    Name = "StringArgumentTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.StringArgumentTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
+            "Nullable", "Nullable", 27,
+            __InvokeTest_Nullable__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Nullable", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "s",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.StringArgumentTests).GetMethod("Nullable", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(""),
+        new global::TUnit.Core.ArgumentsAttribute(@"\"),
+        new global::TUnit.Core.ArgumentsAttribute(@"\t"),
+        new global::TUnit.Core.ArgumentsAttribute("\t"),
+        new global::TUnit.Core.ArgumentsAttribute("\\t"),
+        new global::TUnit.Core.ArgumentsAttribute("\\\t"),
+        new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.StringArgumentTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
index 78fb754550..2f324bcff5 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,175 +9,94 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_TryParse_InvalidString_ReturnsFailure__string__CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1304.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "TryParse_InvalidString_ReturnsFailure",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-            TestMethodName = "TryParse_InvalidString_ReturnsFailure",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
-                new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(" "),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                Name = "TryParse_InvalidString_ReturnsFailure",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "input",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_InvalidString_ReturnsFailure", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_InvalidString_ReturnsFailure", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1304",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TryParse_InvalidString_ReturnsFailure__string__CancellationToken,
-        };
-        metadata_TryParse_InvalidString_ReturnsFailure__string__CancellationToken.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Parse_InvalidString_ThrowsException__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1304.Tests>
+        Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1304",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
+        var metadata_TryParse_InvalidString_ReturnsFailure__string__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
+            "TryParse_InvalidString_ReturnsFailure", "TryParse_InvalidString_ReturnsFailure", 9,
+            __InvokeTest_TryParse_InvalidString_ReturnsFailure__string__CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TryParse_InvalidString_ReturnsFailure", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "Parse_InvalidString_ThrowsException",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-            TestMethodName = "Parse_InvalidString_ThrowsException",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
-                new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(" "),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                Name = "Parse_InvalidString_ThrowsException",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "input",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("Parse_InvalidString_ThrowsException", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1304",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Parse_InvalidString_ThrowsException__string_,
-        };
-        metadata_Parse_InvalidString_ThrowsException__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_TryParse_ValidString_ReturnsAccountId__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1304.Tests>
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
         {
-            TestName = "TryParse_ValidString_ReturnsAccountId",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-            TestMethodName = "TryParse_ValidString_ReturnsAccountId",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("2c48c152-7cb7-4f51-8f01-704454f36e60"),
-                new global::TUnit.Core.ArgumentsAttribute("00000000-0000-0000-0000-000000000000"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 38,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                Name = "TryParse_ValidString_ReturnsAccountId",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "input",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_ValidString_ReturnsAccountId", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1304",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TryParse_ValidString_ReturnsAccountId__string,
-        };
-        metadata_TryParse_ValidString_ReturnsAccountId__string.UseRuntimeDataGeneration(testSessionId);
+        Name = "input",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_InvalidString_ReturnsFailure", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_InvalidString_ReturnsFailure", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
+            new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
+            new global::TUnit.Core.ArgumentsAttribute(""),
+            new global::TUnit.Core.ArgumentsAttribute(" "),
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Parse_InvalidString_ThrowsException__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
+            "Parse_InvalidString_ThrowsException", "Parse_InvalidString_ThrowsException", 26,
+            __InvokeTest_Parse_InvalidString_ThrowsException__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Parse_InvalidString_ThrowsException", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "input",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("Parse_InvalidString_ThrowsException", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
+            new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
+            new global::TUnit.Core.ArgumentsAttribute(""),
+            new global::TUnit.Core.ArgumentsAttribute(" "),
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_TryParse_ValidString_ReturnsAccountId__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
+            "TryParse_ValidString_ReturnsAccountId", "TryParse_ValidString_ReturnsAccountId", 38,
+            __InvokeTest_TryParse_ValidString_ReturnsAccountId__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TryParse_ValidString_ReturnsAccountId", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "input",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_ValidString_ReturnsAccountId", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute("2c48c152-7cb7-4f51-8f01-704454f36e60"),
+            new global::TUnit.Core.ArgumentsAttribute("00000000-0000-0000-0000-000000000000"),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_TryParse_InvalidString_ReturnsFailure__string__CancellationToken, metadata_Parse_InvalidString_ThrowsException__string_, metadata_TryParse_ValidString_ReturnsAccountId__string };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -296,183 +215,126 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TryParse_InvalidString_ReturnsFailure__string__CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1304.Tests>
-        {
-            TestName = "TryParse_InvalidString_ReturnsFailure",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-            TestMethodName = "TryParse_InvalidString_ReturnsFailure",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
-                new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(" "),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                Name = "TryParse_InvalidString_ReturnsFailure",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "input",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_InvalidString_ReturnsFailure", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_InvalidString_ReturnsFailure", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1304",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TryParse_InvalidString_ReturnsFailure__string__CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1304",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
+            "TryParse_InvalidString_ReturnsFailure", "TryParse_InvalidString_ReturnsFailure", 9,
+            __InvokeTest_TryParse_InvalidString_ReturnsFailure__string__CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TryParse_InvalidString_ReturnsFailure", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "input",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_InvalidString_ReturnsFailure", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_InvalidString_ReturnsFailure", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
+        new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
+        new global::TUnit.Core.ArgumentsAttribute(""),
+        new global::TUnit.Core.ArgumentsAttribute(" "),
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Parse_InvalidString_ThrowsException__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1304.Tests>
-        {
-            TestName = "Parse_InvalidString_ThrowsException",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-            TestMethodName = "Parse_InvalidString_ThrowsException",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
-                new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(" "),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 26,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                Name = "Parse_InvalidString_ThrowsException",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "input",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("Parse_InvalidString_ThrowsException", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1304",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Parse_InvalidString_ThrowsException__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1304",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
+            "Parse_InvalidString_ThrowsException", "Parse_InvalidString_ThrowsException", 26,
+            __InvokeTest_Parse_InvalidString_ThrowsException__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Parse_InvalidString_ThrowsException", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "input",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("Parse_InvalidString_ThrowsException", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
+        new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
+        new global::TUnit.Core.ArgumentsAttribute(""),
+        new global::TUnit.Core.ArgumentsAttribute(" "),
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TryParse_ValidString_ReturnsAccountId__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1304.Tests>
-        {
-            TestName = "TryParse_ValidString_ReturnsAccountId",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-            TestMethodName = "TryParse_ValidString_ReturnsAccountId",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute("2c48c152-7cb7-4f51-8f01-704454f36e60"),
-                new global::TUnit.Core.ArgumentsAttribute("00000000-0000-0000-0000-000000000000"),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 38,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                Name = "TryParse_ValidString_ReturnsAccountId",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "input",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_ValidString_ReturnsAccountId", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1304",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TryParse_ValidString_ReturnsAccountId__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1304",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
+            "TryParse_ValidString_ReturnsAccountId", "TryParse_ValidString_ReturnsAccountId", 38,
+            __InvokeTest_TryParse_ValidString_ReturnsAccountId__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TryParse_ValidString_ReturnsAccountId", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "input",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1304.Tests).GetMethod("TryParse_ValidString_ReturnsAccountId", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute("2c48c152-7cb7-4f51-8f01-704454f36e60"),
+        new global::TUnit.Core.ArgumentsAttribute("00000000-0000-0000-0000-000000000000"),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1304.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
index 90dc9da30d..e97983f09a 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,304 +9,254 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Eight_Args__bool_string__string__string__string__string__string__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1538.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Eight_Args",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-            TestMethodName = "Eight_Args",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1538",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1538.Tests);
+        var metadata_Eight_Args__bool_string__string__string__string__string__string__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
+            "Eight_Args", "Eight_Args", 8,
+            __InvokeTest_Eight_Args__bool_string__string__string__string__string__string__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Eight_Args", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "expectedSuccess",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "expectedError",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "expectedT0",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "expectedT1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[3]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "expectedT2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[4]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "expectedT3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[5]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "expectedT4",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[6]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "expectedT5",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[7]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("EightItems")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EightItems")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.Bugs._1538.Tests.EightItems();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.Bugs._1538.Tests.EightItems();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-                Name = "Eight_Args",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "expectedSuccess",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedError",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT0",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[3]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[4]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[5]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[6]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT5",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[7]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1538",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Eight_Args__bool_string__string__string__string__string__string__string_,
-        };
-        metadata_Eight_Args__bool_string__string__string__string__string__string__string_.UseRuntimeDataGeneration(testSessionId);
-        var metadata_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1538.Tests>
-        {
-            TestName = "SixteenArgs",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-            TestMethodName = "SixteenArgs",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
+            "SixteenArgs", "SixteenArgs", 16,
+            __InvokeTest_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SixteenArgs", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "expectedSuccess",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[3]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item4",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[4]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item5",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[5]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item6",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[6]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item7",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[7]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item8",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[8]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item9",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[9]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item10",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[10]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item11",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[11]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item12",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[12]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item13",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[13]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item14",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[14]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "item15",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[15]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("SixteenItems")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SixteenItems")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.Bugs._1538.Tests.SixteenItems();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.Bugs._1538.Tests.SixteenItems();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-                Name = "SixteenArgs",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "expectedSuccess",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[3]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[4]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item5",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[5]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item6",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[6]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item7",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[7]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item8",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[8]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item9",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[9]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item10",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[10]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item11",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[11]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item12",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[12]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item13",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[13]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item14",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[14]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item15",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[15]
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1538",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_,
-        };
-        metadata_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Eight_Args__bool_string__string__string__string__string__string__string_, metadata_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -392,308 +342,270 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Eight_Args__bool_string__string__string__string__string__string__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1538.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1538",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1538.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
+            "Eight_Args", "Eight_Args", 8,
+            __InvokeTest_Eight_Args__bool_string__string__string__string__string__string__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Eight_Args", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "expectedSuccess",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "expectedError",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "expectedT0",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "expectedT1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[3]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "expectedT2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[4]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "expectedT3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[5]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "expectedT4",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[6]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "expectedT5",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[7]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("EightItems")
         {
-            TestName = "Eight_Args",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-            TestMethodName = "Eight_Args",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("EightItems")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.Bugs._1538.Tests.EightItems();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.Bugs._1538.Tests.EightItems();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-                Name = "Eight_Args",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                    else
                     {
-                        Name = "expectedSuccess",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedError",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT0",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[3]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[4]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[5]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[6]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "expectedT5",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("Eight_Args", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[7]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1538",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Eight_Args__bool_string__string__string__string__string__string__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1538.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1538",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1538.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
+            "SixteenArgs", "SixteenArgs", 16,
+            __InvokeTest_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("SixteenArgs", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "expectedSuccess",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item1",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[2]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[3]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item4",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[4]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item5",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[5]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item6",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[6]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item7",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[7]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item8",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[8]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item9",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[9]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item10",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[10]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item11",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[11]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item12",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[12]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item13",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[13]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item14",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[14]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "item15",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[15]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("SixteenItems")
         {
-            TestName = "SixteenArgs",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-            TestMethodName = "SixteenArgs",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("SixteenItems")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.Bugs._1538.Tests.SixteenItems();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.Bugs._1538.Tests.SixteenItems();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-                Name = "SixteenArgs",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                    else
                     {
-                        Name = "expectedSuccess",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item1",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[2]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[3]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item4",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[4]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item5",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[5]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item6",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[6]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item7",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[7]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item8",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[8]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item9",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[9]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item10",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[10]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item11",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[11]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item12",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[12]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item13",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[13]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item14",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[14]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "item15",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1538.Tests).GetMethod("SixteenArgs", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }, null)!.GetParameters()[15]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1538",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1538.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
index eb4ab4f6f6..40e9248792 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_Bugs__1539_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1539.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1539.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1539.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1539",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata_Test.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1539",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1539.Tests);
+        var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1539.Tests>(
+            "Test", "Test", 8,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -94,45 +74,25 @@ internal static class TUnit_TestProject_Bugs__1539_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1539.Tests>
-        {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1539.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1539",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1539.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1539",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1539.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1539.Tests>(
+            "Test", "Test", 8,
+            __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1539.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
index 27bfcc8650..1d21bd7ff4 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,58 +9,39 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1589.MyTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
+        Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+        Name = "MyTests",
+        Namespace = "TUnit.TestProject.Bugs._1589",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+        {
+        Name = "myFixture",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
+            "Test1", "Test1", 15,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
         {Shared = global::TUnit.Core.SharedType.None,},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-                    Name = "MyTests",
-                    Namespace = "TUnit.TestProject.Bugs._1589",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-                        {
-                            Name = "myFixture",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -104,58 +85,39 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1589.MyTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+    Name = "MyTests",
+    Namespace = "TUnit.TestProject.Bugs._1589",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+    {
+    Name = "myFixture",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
+            "Test1", "Test1", 15,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
     {Shared = global::TUnit.Core.SharedType.None,},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-                    Name = "MyTests",
-                    Namespace = "TUnit.TestProject.Bugs._1589",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-                        {
-                            Name = "myFixture",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1589.MyTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
index 98fe5f94a8..267056f8f6 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,58 +9,39 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test1 = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1594.MyTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
+        Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+        Name = "MyTests",
+        Namespace = "TUnit.TestProject.Bugs._1594",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+        {
+        Name = "myFixture",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
+        var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
+            "Test1", "Test1", 15,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
         {Shared = global::TUnit.Core.SharedType.None,},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-                    Name = "MyTests",
-                    Namespace = "TUnit.TestProject.Bugs._1594",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-                        {
-                            Name = "myFixture",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata_Test1.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -105,58 +86,39 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1594.MyTests>
-        {
-            TestName = "Test1",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-            TestMethodName = "Test1",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+    Name = "MyTests",
+    Namespace = "TUnit.TestProject.Bugs._1594",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+    {
+    Name = "myFixture",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
+            "Test1", "Test1", 15,
+            __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
     {Shared = global::TUnit.Core.SharedType.None,},
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-                Name = "Test1",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-                    Name = "MyTests",
-                    Namespace = "TUnit.TestProject.Bugs._1594",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-                        {
-                            Name = "myFixture",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test1,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1594.MyTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
index a6c999b15d..68975d075d 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,108 +9,58 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Casted_Integer_To_Short_Converts__short = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1603.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Casted_Integer_To_Short_Converts",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-            TestMethodName = "Casted_Integer_To_Short_Converts",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute((short) -123),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-                Name = "Casted_Integer_To_Short_Converts",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(short))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(short)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1603.Tests).GetMethod("Casted_Integer_To_Short_Converts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(short) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1603",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Casted_Integer_To_Short_Converts__short,
-        };
-        metadata_Casted_Integer_To_Short_Converts__short.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Integer_To_Short_Converts__short = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1603.Tests>
+        Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1603",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1603.Tests);
+        var metadata_Casted_Integer_To_Short_Converts__short = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
+            "Casted_Integer_To_Short_Converts", "Casted_Integer_To_Short_Converts", 8,
+            __InvokeTest_Casted_Integer_To_Short_Converts__short, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Casted_Integer_To_Short_Converts", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "Integer_To_Short_Converts",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-            TestMethodName = "Integer_To_Short_Converts",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(-123),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-                Name = "Integer_To_Short_Converts",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(short))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(short)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1603.Tests).GetMethod("Integer_To_Short_Converts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(short) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1603",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Integer_To_Short_Converts__short,
-        };
-        metadata_Integer_To_Short_Converts__short.UseRuntimeDataGeneration(testSessionId);
+        new global::TUnit.Core.ParameterMetadata(typeof(short))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(short)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1603.Tests).GetMethod("Casted_Integer_To_Short_Converts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(short) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute((short) -123),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Integer_To_Short_Converts__short = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
+            "Integer_To_Short_Converts", "Integer_To_Short_Converts", 15,
+            __InvokeTest_Integer_To_Short_Converts__short, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Integer_To_Short_Converts", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(short))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(short)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1603.Tests).GetMethod("Integer_To_Short_Converts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(short) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(-123),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Casted_Integer_To_Short_Converts__short, metadata_Integer_To_Short_Converts__short };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -194,112 +144,74 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Casted_Integer_To_Short_Converts__short(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1603.Tests>
-        {
-            TestName = "Casted_Integer_To_Short_Converts",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-            TestMethodName = "Casted_Integer_To_Short_Converts",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute((short) -123),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-                Name = "Casted_Integer_To_Short_Converts",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(short))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(short)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1603.Tests).GetMethod("Casted_Integer_To_Short_Converts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(short) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1603",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Casted_Integer_To_Short_Converts__short,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1603",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1603.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
+            "Casted_Integer_To_Short_Converts", "Casted_Integer_To_Short_Converts", 8,
+            __InvokeTest_Casted_Integer_To_Short_Converts__short, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Casted_Integer_To_Short_Converts", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(short))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(short)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1603.Tests).GetMethod("Casted_Integer_To_Short_Converts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(short) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute((short) -123),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Integer_To_Short_Converts__short(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1603.Tests>
-        {
-            TestName = "Integer_To_Short_Converts",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-            TestMethodName = "Integer_To_Short_Converts",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(-123),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-                Name = "Integer_To_Short_Converts",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(short))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(short)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1603.Tests).GetMethod("Integer_To_Short_Converts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(short) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1603",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Integer_To_Short_Converts__short,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1603",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1603.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
+            "Integer_To_Short_Converts", "Integer_To_Short_Converts", 15,
+            __InvokeTest_Integer_To_Short_Converts__short, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Integer_To_Short_Converts", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(short))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(short)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1603.Tests).GetMethod("Integer_To_Short_Converts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(short) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(-123),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1603.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
index a012a0d7bb..654a8abc5a 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,58 +9,39 @@ internal static class TUnit_TestProject_Bugs__1692_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_NullTest__string_ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1692.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1692.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "NullTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
-            TestMethodName = "NullTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 10,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
-                Name = "NullTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "t",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1692.Tests).GetMethod("NullTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1692.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1692",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullTest__string_,
-        };
-        metadata_NullTest__string_.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1692",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1692.Tests);
+        var metadata_NullTest__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1692.Tests>(
+            "NullTest", "NullTest", 10,
+            __InvokeTest_NullTest__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "t",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = true,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1692.Tests).GetMethod("NullTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(null),
+            new global::TUnit.Core.ArgumentsAttribute(null),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_NullTest__string_ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -110,58 +91,39 @@ internal static class TUnit_TestProject_Bugs__1692_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullTest__string_(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1692.Tests>
-        {
-            TestName = "NullTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
-            TestMethodName = "NullTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 10,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
-                Name = "NullTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "t",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = true,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1692.Tests).GetMethod("NullTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1692.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1692",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_NullTest__string_,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1692.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1692",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1692.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1692.Tests>(
+            "NullTest", "NullTest", 10,
+            __InvokeTest_NullTest__string_, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("NullTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "t",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = true,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1692.Tests).GetMethod("NullTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(null),
+        new global::TUnit.Core.ArgumentsAttribute(null),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1692.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
index 7b5444a1a3..8c125550ae 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,132 +9,75 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_MethodDataSource__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1821.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "MethodDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-            TestMethodName = "MethodDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.InstanceMethodDataSourceAttribute("DataSource"),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-                Name = "MethodDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetMethod("MethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1821",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
-                        {
-                            Name = "data",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MethodDataSource__string,
-        };
-        metadata_MethodDataSource__string.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixDataSource__string = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1821.Tests>
+        Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1821",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "MatrixDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-            TestMethodName = "MatrixDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-                Name = "MatrixDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetMethod("MatrixDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1821",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
-                        {
-                            Name = "data",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixDataSource__string,
-        };
-        metadata_MatrixDataSource__string.UseRuntimeDataGeneration(testSessionId);
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
+        {
+        Name = "data",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1821.Tests);
+        var metadata_MethodDataSource__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
+            "MethodDataSource", "MethodDataSource", 9,
+            __InvokeTest_MethodDataSource__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MethodDataSource", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetMethod("MethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.InstanceMethodDataSourceAttribute("DataSource"),
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixDataSource__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
+            "MatrixDataSource", "MatrixDataSource", 16,
+            __InvokeTest_MatrixDataSource__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixDataSource", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetMethod("MatrixDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_MethodDataSource__string, metadata_MatrixDataSource__string };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -219,136 +162,100 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MethodDataSource__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1821.Tests>
-        {
-            TestName = "MethodDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-            TestMethodName = "MethodDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.InstanceMethodDataSourceAttribute("DataSource"),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 9,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-                Name = "MethodDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetMethod("MethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1821",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
-                        {
-                            Name = "data",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MethodDataSource__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1821",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
+    {
+    Name = "data",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1821.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
+            "MethodDataSource", "MethodDataSource", 9,
+            __InvokeTest_MethodDataSource__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MethodDataSource", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetMethod("MethodDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.InstanceMethodDataSourceAttribute("DataSource"),
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixDataSource__string(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._1821.Tests>
-        {
-            TestName = "MatrixDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-            TestMethodName = "MatrixDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 16,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-                Name = "MatrixDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetMethod("MatrixDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._1821",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
-                        {
-                            Name = "data",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixDataSource__string,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._1821",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
+    {
+    Name = "data",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._1821.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
+            "MatrixDataSource", "MatrixDataSource", 16,
+            __InvokeTest_MatrixDataSource__string, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixDataSource", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetMethod("MatrixDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(string) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._1821.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
index 55344dd073..2bda907050 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,62 +9,43 @@ internal static class TUnit_TestProject_Bugs__2083_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_MyTest__long = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2083.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2083.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "MyTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
-            TestMethodName = "MyTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0),
-                new global::TUnit.Core.ArgumentsAttribute((byte)255),
-                new global::TUnit.Core.ArgumentsAttribute((short)32767),
-                new global::TUnit.Core.ArgumentsAttribute('\uffff'),
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-                new global::TUnit.Core.ArgumentsAttribute(9223372036854775807L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
-                Name = "MyTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(long))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2083.Tests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2083.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2083",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MyTest__long,
-        };
-        metadata_MyTest__long.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2083",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2083.Tests);
+        var metadata_MyTest__long = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2083.Tests>(
+            "MyTest", "MyTest", 8,
+            __InvokeTest_MyTest__long, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MyTest", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(long))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2083.Tests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(0),
+            new global::TUnit.Core.ArgumentsAttribute((byte)255),
+            new global::TUnit.Core.ArgumentsAttribute((short)32767),
+            new global::TUnit.Core.ArgumentsAttribute('\uffff'),
+            new global::TUnit.Core.ArgumentsAttribute(2147483647),
+            new global::TUnit.Core.ArgumentsAttribute(9223372036854775807L),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_MyTest__long };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -115,62 +96,43 @@ internal static class TUnit_TestProject_Bugs__2083_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MyTest__long(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2083.Tests>
-        {
-            TestName = "MyTest",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
-            TestMethodName = "MyTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0),
-                new global::TUnit.Core.ArgumentsAttribute((byte)255),
-                new global::TUnit.Core.ArgumentsAttribute((short)32767),
-                new global::TUnit.Core.ArgumentsAttribute('\uffff'),
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-                new global::TUnit.Core.ArgumentsAttribute(9223372036854775807L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
-                Name = "MyTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(long))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2083.Tests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2083.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2083",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MyTest__long,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2083.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._2083",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2083.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2083.Tests>(
+            "MyTest", "MyTest", 8,
+            __InvokeTest_MyTest__long, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MyTest", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(long))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2083.Tests).GetMethod("MyTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(long) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(0),
+        new global::TUnit.Core.ArgumentsAttribute((byte)255),
+        new global::TUnit.Core.ArgumentsAttribute((short)32767),
+        new global::TUnit.Core.ArgumentsAttribute('\uffff'),
+        new global::TUnit.Core.ArgumentsAttribute(2147483647),
+        new global::TUnit.Core.ArgumentsAttribute(9223372036854775807L),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._2083.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
index 6416b5c7ee..28f3006bdd 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,108 +9,58 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Double_SpecialConsts__double = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2085.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Double_SpecialConsts",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-            TestMethodName = "Double_SpecialConsts",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-                Name = "Double_SpecialConsts",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "d",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2085.Tests).GetMethod("Double_SpecialConsts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2085",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Double_SpecialConsts__double,
-        };
-        metadata_Double_SpecialConsts__double.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Float_SpecialConsts__float = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2085.Tests>
+        Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2085",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2085.Tests);
+        var metadata_Double_SpecialConsts__double = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
+            "Double_SpecialConsts", "Double_SpecialConsts", 8,
+            __InvokeTest_Double_SpecialConsts__double, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Double_SpecialConsts", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "Float_SpecialConsts",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-            TestMethodName = "Float_SpecialConsts",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-                Name = "Float_SpecialConsts",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(float))
-                    {
-                        Name = "d",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2085.Tests).GetMethod("Float_SpecialConsts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2085",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Float_SpecialConsts__float,
-        };
-        metadata_Float_SpecialConsts__float.UseRuntimeDataGeneration(testSessionId);
+        new global::TUnit.Core.ParameterMetadata(typeof(double))
+        {
+        Name = "d",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2085.Tests).GetMethod("Double_SpecialConsts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Float_SpecialConsts__float = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
+            "Float_SpecialConsts", "Float_SpecialConsts", 15,
+            __InvokeTest_Float_SpecialConsts__float, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Float_SpecialConsts", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(float))
+        {
+        Name = "d",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2085.Tests).GetMethod("Float_SpecialConsts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Double_SpecialConsts__double, metadata_Float_SpecialConsts__float };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -194,112 +144,74 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Double_SpecialConsts__double(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2085.Tests>
-        {
-            TestName = "Double_SpecialConsts",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-            TestMethodName = "Double_SpecialConsts",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-                Name = "Double_SpecialConsts",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(double))
-                    {
-                        Name = "d",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2085.Tests).GetMethod("Double_SpecialConsts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2085",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Double_SpecialConsts__double,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._2085",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2085.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
+            "Double_SpecialConsts", "Double_SpecialConsts", 8,
+            __InvokeTest_Double_SpecialConsts__double, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Double_SpecialConsts", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(double))
+    {
+    Name = "d",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(double)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2085.Tests).GetMethod("Double_SpecialConsts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(double) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Float_SpecialConsts__float(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2085.Tests>
-        {
-            TestName = "Float_SpecialConsts",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-            TestMethodName = "Float_SpecialConsts",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-                Name = "Float_SpecialConsts",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(float))
-                    {
-                        Name = "d",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2085.Tests).GetMethod("Float_SpecialConsts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2085",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Float_SpecialConsts__float,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._2085",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2085.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
+            "Float_SpecialConsts", "Float_SpecialConsts", 15,
+            __InvokeTest_Float_SpecialConsts__float, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Float_SpecialConsts", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(float))
+    {
+    Name = "d",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(float)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2085.Tests).GetMethod("Float_SpecialConsts", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(float) }, null)!.GetParameters()[0]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._2085.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
index bbf2130a98..eb382501d4 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,124 +9,74 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_Test__int_long__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2112.Tests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L),
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "a",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(long[]))
-                    {
-                        Name = "arr",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2112",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test__int_long__,
-        };
-        metadata_Test__int_long__.UseRuntimeDataGeneration(testSessionId);
-        var metadata_Test2__int_long__ = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2112.Tests>
+        Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2112",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2112.Tests);
+        var metadata_Test__int_long__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
+            "Test", "Test", 8,
+            __InvokeTest_Test__int_long__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "a",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(long[]))
-                    {
-                        Name = "arr",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2112",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2__int_long__,
-        };
-        metadata_Test2__int_long__.UseRuntimeDataGeneration(testSessionId);
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "a",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(long[]))
+        {
+        Name = "arr",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(0, 1L),
+            new global::TUnit.Core.ArgumentsAttribute(0, 1L),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_Test2__int_long__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
+            "Test2", "Test2", 15,
+            __InvokeTest_Test2__int_long__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "a",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(long[]))
+        {
+        Name = "arr",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long[])),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
+            new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test__int_long__, metadata_Test2__int_long__ };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -272,128 +222,90 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test__int_long__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2112.Tests>
-        {
-            TestName = "Test",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-            TestMethodName = "Test",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L),
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-                Name = "Test",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "a",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(long[]))
-                    {
-                        Name = "arr",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2112",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test__int_long__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._2112",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2112.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
+            "Test", "Test", 8,
+            __InvokeTest_Test__int_long__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "a",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(long[]))
+    {
+    Name = "arr",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(0, 1L),
+        new global::TUnit.Core.ArgumentsAttribute(0, 1L),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2__int_long__(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.Bugs._2112.Tests>
-        {
-            TestName = "Test2",
-            TestClassType = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-            TestMethodName = "Test2",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 15,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-                Name = "Test2",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "a",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(long[]))
-                    {
-                        Name = "arr",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long[])),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-                    Name = "Tests",
-                    Namespace = "TUnit.TestProject.Bugs._2112",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_Test2__int_long__,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
+    Name = "Tests",
+    Namespace = "TUnit.TestProject.Bugs._2112",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.Bugs._2112.Tests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
+            "Test2", "Test2", 15,
+            __InvokeTest_Test2__int_long__, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "a",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(long[]))
+    {
+    Name = "arr",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(long[])),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._2112.Tests).GetMethod("Test2", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(long[]) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
+        new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.Bugs._2112.Tests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
index 0fdabb9148..789ed48c0d 100644
--- a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,543 +9,327 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DefaultTest__CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+        Name = "TimeoutCancellationTokenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
         {
-            TestName = "DefaultTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "DefaultTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
+        var metadata_DefaultTest__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "DefaultTest", "DefaultTest", 14,
+            __InvokeTest_DefaultTest__CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DefaultTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DefaultTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        }
+        }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "DefaultTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DefaultTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
+                        else
                         {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    }
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DefaultTest__CancellationToken,
-        };
-        metadata_DefaultTest__CancellationToken.UseRuntimeDataGeneration(testSessionId);
-        var metadata_BasicTest__CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
-        {
-            TestName = "BasicTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "BasicTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_BasicTest__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "BasicTest", "BasicTest", 21,
+            __InvokeTest_BasicTest__CancellationToken, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BasicTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("BasicTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        }
+        }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 21,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "BasicTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("BasicTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
+                        else
                         {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    }
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BasicTest__CancellationToken,
-        };
-        metadata_BasicTest__CancellationToken.UseRuntimeDataGeneration(testSessionId);
-        var metadata_InheritedTimeoutAttribute__CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
-        {
-            TestName = "InheritedTimeoutAttribute",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "InheritedTimeoutAttribute",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_2,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_InheritedTimeoutAttribute__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "InheritedTimeoutAttribute", "InheritedTimeoutAttribute", 30,
+            __InvokeTest_InheritedTimeoutAttribute__CancellationToken, __CreateAttributes_2, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("InheritedTimeoutAttribute", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("InheritedTimeoutAttribute", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        }
+        }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "InheritedTimeoutAttribute",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("InheritedTimeoutAttribute", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
+                        else
                         {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_InheritedTimeoutAttribute__CancellationToken,
-        };
-        metadata_InheritedTimeoutAttribute__CancellationToken.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataTest__int_CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
-        {
-            TestName = "DataTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "DataTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_3,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1),
+                    }
+                    return Factory();
+                }
             },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataTest__int_CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "DataTest", "DataTest", 38,
+            __InvokeTest_DataTest__int_CancellationToken, __CreateAttributes_3, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1),
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 38,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "DataTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
+                        else
                         {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    }
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataTest__int_CancellationToken,
-        };
-        metadata_DataTest__int_CancellationToken.UseRuntimeDataGeneration(testSessionId);
-        var metadata_DataSourceTest__int_CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
-        {
-            TestName = "DataSourceTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "DataSourceTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_4,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_DataSourceTest__int_CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "DataSourceTest", "DataSourceTest", 48,
+            __InvokeTest_DataSourceTest__int_CancellationToken, __CreateAttributes_4, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSourceTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
+                        else
+                        {
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                        }
                     }
-                },
+                    return Factory();
+                }
             },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
+                            foreach (var item in enumerable)
                             {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 48,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "DataSourceTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
+                        else
                         {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSourceTest__int_CancellationToken,
-        };
-        metadata_DataSourceTest__int_CancellationToken.UseRuntimeDataGeneration(testSessionId);
-        var metadata_MatrixTest__int_CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
-        {
-            TestName = "MatrixTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "MatrixTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_5,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
+                    }
+                    return Factory();
+                }
             },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
+        var metadata_MatrixTest__int_CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "MatrixTest", "MatrixTest", 58,
+            __InvokeTest_MatrixTest__int_CancellationToken, __CreateAttributes_5, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("MatrixTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("MatrixTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MatrixDataSourceAttribute(),
+        },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "MatrixTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("MatrixTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("MatrixTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
+                        else
                         {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    }
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest__int_CancellationToken,
-        };
-        metadata_MatrixTest__int_CancellationToken.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DefaultTest__CancellationToken, metadata_BasicTest__CancellationToken, metadata_InheritedTimeoutAttribute__CancellationToken, metadata_DataTest__int_CancellationToken, metadata_DataSourceTest__int_CancellationToken, metadata_MatrixTest__int_CancellationToken };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -803,563 +587,452 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DefaultTest__CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+    Name = "TimeoutCancellationTokenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "DefaultTest", "DefaultTest", 14,
+            __InvokeTest_DefaultTest__CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DefaultTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DefaultTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    }
+    }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
         {
-            TestName = "DefaultTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "DefaultTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 14,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "DefaultTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                    else
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DefaultTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DefaultTest__CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BasicTest__CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+    Name = "TimeoutCancellationTokenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "BasicTest", "BasicTest", 21,
+            __InvokeTest_BasicTest__CancellationToken, __CreateAttributes_1, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("BasicTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("BasicTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    }
+    }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
         {
-            TestName = "BasicTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "BasicTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_1,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 21,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "BasicTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                    else
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("BasicTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_BasicTest__CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_InheritedTimeoutAttribute__CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+    Name = "TimeoutCancellationTokenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "InheritedTimeoutAttribute", "InheritedTimeoutAttribute", 30,
+            __InvokeTest_InheritedTimeoutAttribute__CancellationToken, __CreateAttributes_2, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("InheritedTimeoutAttribute", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("InheritedTimeoutAttribute", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    }
+    }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
         {
-            TestName = "InheritedTimeoutAttribute",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "InheritedTimeoutAttribute",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_2,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 30,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "InheritedTimeoutAttribute",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                    else
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("InheritedTimeoutAttribute", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_InheritedTimeoutAttribute__CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataTest__int_CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+    Name = "TimeoutCancellationTokenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "DataTest", "DataTest", 38,
+            __InvokeTest_DataTest__int_CancellationToken, __CreateAttributes_3, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1),
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
         {
-            TestName = "DataTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "DataTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_3,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.ArgumentsAttribute(1),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 38,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "DataTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                    else
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataTest__int_CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSourceTest__int_CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+    Name = "TimeoutCancellationTokenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "DataSourceTest", "DataSourceTest", 48,
+            __InvokeTest_DataSourceTest__int_CancellationToken, __CreateAttributes_4, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSourceTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
         {
-            TestName = "DataSourceTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "DataSourceTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_4,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+                    else
+                    {
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                    }
+                }
+                return Factory();
+            }
+        },
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+        {
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 48,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "DataSourceTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                    else
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("DataSourceTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSourceTest__int_CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest__int_CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutCancellationTokenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+    Name = "TimeoutCancellationTokenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
+            "MatrixTest", "MatrixTest", 58,
+            __InvokeTest_MatrixTest__int_CancellationToken, __CreateAttributes_5, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("MatrixTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("MatrixTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("MatrixTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MatrixDataSourceAttribute(),
+    },
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
         {
-            TestName = "MatrixTest",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-            TestMethodName = "MatrixTest",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_5,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
-            },
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.TimeoutCancellationTokenTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 58,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                Name = "MatrixTest",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("MatrixTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                    else
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetMethod("MatrixTest", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[1]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-                    Name = "TimeoutCancellationTokenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_MatrixTest__int_CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.TimeoutCancellationTokenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
@@ -1387,87 +1060,68 @@ internal static class TUnit_TestProject_TimeoutDoesNotFireTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_QuickTestDoesNotTimeout__CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutDoesNotFireTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutDoesNotFireTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
+        Name = "TimeoutDoesNotFireTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests);
+        var metadata_QuickTestDoesNotTimeout__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutDoesNotFireTests>(
+            "QuickTestDoesNotTimeout", "QuickTestDoesNotTimeout", 86,
+            __InvokeTest_QuickTestDoesNotTimeout__CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("QuickTestDoesNotTimeout", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetMethod("QuickTestDoesNotTimeout", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        }
+        }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "QuickTestDoesNotTimeout",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
-            TestMethodName = "QuickTestDoesNotTimeout",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.TimeoutDoesNotFireTests.DataSource();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.TimeoutDoesNotFireTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 86,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
-                Name = "QuickTestDoesNotTimeout",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetMethod("QuickTestDoesNotTimeout", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutDoesNotFireTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
-                    Name = "TimeoutDoesNotFireTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
+                        else
                         {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    }
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_QuickTestDoesNotTimeout__CancellationToken,
-        };
-        metadata_QuickTestDoesNotTimeout__CancellationToken.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_QuickTestDoesNotTimeout__CancellationToken };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1512,87 +1166,68 @@ internal static class TUnit_TestProject_TimeoutDoesNotFireTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_QuickTestDoesNotTimeout__CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TimeoutDoesNotFireTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutDoesNotFireTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
+    Name = "TimeoutDoesNotFireTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutDoesNotFireTests>(
+            "QuickTestDoesNotTimeout", "QuickTestDoesNotTimeout", 86,
+            __InvokeTest_QuickTestDoesNotTimeout__CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("QuickTestDoesNotTimeout", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetMethod("QuickTestDoesNotTimeout", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    }
+    }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
         {
-            TestName = "QuickTestDoesNotTimeout",
-            TestClassType = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
-            TestMethodName = "QuickTestDoesNotTimeout",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.TimeoutDoesNotFireTests.DataSource();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.TimeoutDoesNotFireTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 86,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
-                Name = "QuickTestDoesNotTimeout",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                    else
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetMethod("QuickTestDoesNotTimeout", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutDoesNotFireTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
-                    Name = "TimeoutDoesNotFireTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_QuickTestDoesNotTimeout__CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.TimeoutDoesNotFireTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
@@ -1620,87 +1255,68 @@ internal static class TUnit_TestProject_CancellationTokenTriggeredTests__TestSou
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_CancellationTokenIsTriggered__CancellationToken = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CancellationTokenTriggeredTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CancellationTokenTriggeredTests", new global::TUnit.Core.ClassMetadata
+        {
+        Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
+        Name = "CancellationTokenTriggeredTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests);
+        var metadata_CancellationTokenIsTriggered__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CancellationTokenTriggeredTests>(
+            "CancellationTokenIsTriggered", "CancellationTokenIsTriggered", 106,
+            __InvokeTest_CancellationTokenIsTriggered__CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("CancellationTokenIsTriggered", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+        {
+        Name = "cancellationToken",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetMethod("CancellationTokenIsTriggered", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+        }
+        }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
         {
-            TestName = "CancellationTokenIsTriggered",
-            TestClassType = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
-            TestMethodName = "CancellationTokenIsTriggered",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        var result = global::TUnit.TestProject.CancellationTokenTriggeredTests.DataSource();
+                        if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                         {
-                            var result = global::TUnit.TestProject.CancellationTokenTriggeredTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
+                            foreach (var item in enumerable)
                             {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                             }
                         }
-                        return Factory();
-                    }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 106,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
-                Name = "CancellationTokenIsTriggered",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
-                    {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetMethod("CancellationTokenIsTriggered", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CancellationTokenTriggeredTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
-                    Name = "CancellationTokenTriggeredTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
+                        else
                         {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                         }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    }
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_CancellationTokenIsTriggered__CancellationToken,
-        };
-        metadata_CancellationTokenIsTriggered__CancellationToken.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_CancellationTokenIsTriggered__CancellationToken };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -1745,87 +1361,68 @@ internal static class TUnit_TestProject_CancellationTokenTriggeredTests__TestSou
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_CancellationTokenIsTriggered__CancellationToken(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.CancellationTokenTriggeredTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CancellationTokenTriggeredTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
+    Name = "CancellationTokenTriggeredTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+    }
+    },
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CancellationTokenTriggeredTests>(
+            "CancellationTokenIsTriggered", "CancellationTokenIsTriggered", 106,
+            __InvokeTest_CancellationTokenIsTriggered__CancellationToken, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("CancellationTokenIsTriggered", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+    {
+    Name = "cancellationToken",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetMethod("CancellationTokenIsTriggered", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+    }
+    }),
+            classDataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
         {
-            TestName = "CancellationTokenIsTriggered",
-            TestClassType = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
-            TestMethodName = "CancellationTokenIsTriggered",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
+                    var result = global::TUnit.TestProject.CancellationTokenTriggeredTests.DataSource();
+                    if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
                     {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
+                        foreach (var item in enumerable)
                         {
-                            var result = global::TUnit.TestProject.CancellationTokenTriggeredTests.DataSource();
-                            if (result is global::System.Collections.IEnumerable enumerable && !(result is string))
-                            {
-                                foreach (var item in enumerable)
-                                {
-                                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
-                                }
-                            }
-                            else
-                            {
-                                yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                            }
+                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(item));
                         }
-                        return Factory();
                     }
-                },
-            },
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 106,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
-                Name = "CancellationTokenIsTriggered",
-                GenericTypeCount = 0,
-                ReturnType = typeof(global::System.Threading.Tasks.Task),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(global::System.Threading.CancellationToken))
+                    else
                     {
-                        Name = "cancellationToken",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.CancellationToken)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetMethod("CancellationTokenIsTriggered", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(global::System.Threading.CancellationToken) }, null)!.GetParameters()[0]
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CancellationTokenTriggeredTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
-                    Name = "CancellationTokenTriggeredTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = new global::TUnit.Core.ParameterMetadata[]
-                    {
-                        new global::TUnit.Core.ParameterMetadata(typeof(int))
-                        {
-                            Name = "value",
-                            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                            IsNullable = false,
-                            ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-                        }
-                    },
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_CancellationTokenIsTriggered__CancellationToken,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.CancellationTokenTriggeredTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
index 341381d3aa..a651380f8a 100644
--- a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,82 +9,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_DataSource_TupleMethod__int_string_bool = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
-                {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
             {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
+                Factory = (dataGeneratorMetadata) =>
                 {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                    async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                     {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+                        var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                        yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
                     }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
+                    return Factory();
+                }
             },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata_DataSource_TupleMethod__int_string_bool.UseRuntimeDataGeneration(testSessionId);
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -135,82 +116,63 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TupleDataSourceDrivenTests>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+    Name = "TupleDataSourceDrivenTests",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
+            "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
+            __InvokeTest_DataSource_TupleMethod__int_string_bool, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("DataSource_TupleMethod", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "value",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(string))
+    {
+    Name = "value2",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(bool))
+    {
+    Name = "value3",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
         {
-            TestName = "DataSource_TupleMethod",
-            TestClassType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-            TestMethodName = "DataSource_TupleMethod",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
+            Factory = (dataGeneratorMetadata) =>
             {
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod")
+                async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
                 {
-                    Factory = (dataGeneratorMetadata) =>
-                    {
-                        async global::System.Collections.Generic.IAsyncEnumerable<global::System.Func<global::System.Threading.Tasks.Task<object?[]?>>> Factory()
-                        {
-                            var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
-                            yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
-                        }
-                        return Factory();
-                    }
-                },
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                Name = "DataSource_TupleMethod",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "value",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(string))
-                    {
-                        Name = "value2",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-                    {
-                        Name = "value3",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests).GetMethod("DataSource_TupleMethod", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(string), typeof(bool) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-                    Name = "TupleDataSourceDrivenTests",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_DataSource_TupleMethod__int_string_bool,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+                    var result = global::TUnit.TestProject.TupleDataSourceDrivenTests.TupleMethod();
+                    yield return () => global::System.Threading.Tasks.Task.FromResult(global::TUnit.Core.Helpers.DataSourceHelpers.ToObjectArray(result));
+                }
+                return Factory();
+            }
+        },
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.TupleDataSourceDrivenTests CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
index bd293655db..39bb76d714 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,72 +9,53 @@ internal static class TUnit_TestProject_AotDataSourceTest__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_TestWithDataSource__int_int_int = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AotDataSourceTest>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.AotDataSourceTest", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "TestWithDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.AotDataSourceTest),
-            TestMethodName = "TestWithDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, 2, 3),
-                new global::TUnit.Core.ArgumentsAttribute(4, 5, 6),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
-                Name = "TestWithDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "a",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "b",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "c",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.AotDataSourceTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
-                    Name = "AotDataSourceTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithDataSource__int_int_int,
-        };
-        metadata_TestWithDataSource__int_int_int.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
+        Name = "AotDataSourceTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.AotDataSourceTest);
+        var metadata_TestWithDataSource__int_int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AotDataSourceTest>(
+            "TestWithDataSource", "TestWithDataSource", 7,
+            __InvokeTest_TestWithDataSource__int_int_int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithDataSource", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "a",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "b",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "c",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[2]
+        }
+        }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+        {
+            new global::TUnit.Core.ArgumentsAttribute(1, 2, 3),
+            new global::TUnit.Core.ArgumentsAttribute(4, 5, 6),
+        },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithDataSource__int_int_int };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -124,72 +105,53 @@ internal static class TUnit_TestProject_AotDataSourceTest__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithDataSource__int_int_int(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.AotDataSourceTest>
-        {
-            TestName = "TestWithDataSource",
-            TestClassType = typeof(global::TUnit.TestProject.AotDataSourceTest),
-            TestMethodName = "TestWithDataSource",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = new global::TUnit.Core.IDataSourceAttribute[]
-            {
-                new global::TUnit.Core.ArgumentsAttribute(1, 2, 3),
-                new global::TUnit.Core.ArgumentsAttribute(4, 5, 6),
-            },
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
-                Name = "TestWithDataSource",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = new global::TUnit.Core.ParameterMetadata[]
-                {
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "a",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[0]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "b",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[1]
-                    },
-                    new global::TUnit.Core.ParameterMetadata(typeof(int))
-                    {
-                        Name = "c",
-                        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-                        IsNullable = false,
-                        ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[2]
-                    }
-                },
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.AotDataSourceTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
-                    Name = "AotDataSourceTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithDataSource__int_int_int,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.AotDataSourceTest", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
+    Name = "AotDataSourceTest",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.AotDataSourceTest);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AotDataSourceTest>(
+            "TestWithDataSource", "TestWithDataSource", 7,
+            __InvokeTest_TestWithDataSource__int_int_int, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithDataSource", __classType, typeof(void), __classMetadata, parameters: new global::TUnit.Core.ParameterMetadata[]
+    {
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "a",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[0]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "b",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[1]
+    },
+    new global::TUnit.Core.ParameterMetadata(typeof(int))
+    {
+    Name = "c",
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+    IsNullable = false,
+    ReflectionInfo = typeof(global::TUnit.TestProject.AotDataSourceTest).GetMethod("TestWithDataSource", global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, new global::System.Type[] { typeof(int), typeof(int), typeof(int) }, null)!.GetParameters()[2]
+    }
+    }),
+            dataSources: new global::TUnit.Core.IDataSourceAttribute[]
+    {
+        new global::TUnit.Core.ArgumentsAttribute(1, 2, 3),
+        new global::TUnit.Core.ArgumentsAttribute(4, 5, 6),
+    },
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.AotDataSourceTest CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
index 202aff7bbf..c91bd4edc0 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_ConfigurationTest__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_TestWithConfiguration = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConfigurationTest>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ConfigurationTest", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "TestWithConfiguration",
-            TestClassType = typeof(global::TUnit.TestProject.ConfigurationTest),
-            TestMethodName = "TestWithConfiguration",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConfigurationTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
-                Name = "TestWithConfiguration",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ConfigurationTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConfigurationTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
-                    Name = "ConfigurationTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithConfiguration,
-        };
-        metadata_TestWithConfiguration.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.ConfigurationTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
+        Name = "ConfigurationTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ConfigurationTest);
+        var metadata_TestWithConfiguration = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConfigurationTest>(
+            "TestWithConfiguration", "TestWithConfiguration", 7,
+            __InvokeTest_TestWithConfiguration, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithConfiguration", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithConfiguration };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -89,45 +69,25 @@ internal static class TUnit_TestProject_ConfigurationTest__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithConfiguration(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ConfigurationTest>
-        {
-            TestName = "TestWithConfiguration",
-            TestClassType = typeof(global::TUnit.TestProject.ConfigurationTest),
-            TestMethodName = "TestWithConfiguration",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ConfigurationTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
-                Name = "TestWithConfiguration",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ConfigurationTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ConfigurationTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
-                    Name = "ConfigurationTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithConfiguration,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ConfigurationTest", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ConfigurationTest),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
+    Name = "ConfigurationTest",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ConfigurationTest);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConfigurationTest>(
+            "TestWithConfiguration", "TestWithConfiguration", 7,
+            __InvokeTest_TestWithConfiguration, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithConfiguration", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ConfigurationTest CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
index 91aadac8cd..29ac37757e 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_ModuleInitializerTest__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_TestWithModuleInit = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ModuleInitializerTest>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ModuleInitializerTest", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "TestWithModuleInit",
-            TestClassType = typeof(global::TUnit.TestProject.ModuleInitializerTest),
-            TestMethodName = "TestWithModuleInit",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
-                Name = "TestWithModuleInit",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ModuleInitializerTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
-                    Name = "ModuleInitializerTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithModuleInit,
-        };
-        metadata_TestWithModuleInit.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
+        Name = "ModuleInitializerTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.ModuleInitializerTest);
+        var metadata_TestWithModuleInit = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ModuleInitializerTest>(
+            "TestWithModuleInit", "TestWithModuleInit", 8,
+            __InvokeTest_TestWithModuleInit, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithModuleInit", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithModuleInit };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -89,45 +69,25 @@ internal static class TUnit_TestProject_ModuleInitializerTest__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithModuleInit(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.ModuleInitializerTest>
-        {
-            TestName = "TestWithModuleInit",
-            TestClassType = typeof(global::TUnit.TestProject.ModuleInitializerTest),
-            TestMethodName = "TestWithModuleInit",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 8,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
-                Name = "TestWithModuleInit",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ModuleInitializerTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
-                    Name = "ModuleInitializerTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithModuleInit,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ModuleInitializerTest", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
+    Name = "ModuleInitializerTest",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.ModuleInitializerTest);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ModuleInitializerTest>(
+            "TestWithModuleInit", "TestWithModuleInit", 8,
+            __InvokeTest_TestWithModuleInit, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithModuleInit", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.ModuleInitializerTest CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
index f463505635..acf704f19f 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -9,45 +9,25 @@ internal static class TUnit_TestProject_TypedDelegateTest__TestSource
 {
     public static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> GetTests(string testSessionId)
     {
-        var metadata_TestWithDelegate = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TypedDelegateTest>
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.TypedDelegateTest", new global::TUnit.Core.ClassMetadata
         {
-            TestName = "TestWithDelegate",
-            TestClassType = typeof(global::TUnit.TestProject.TypedDelegateTest),
-            TestMethodName = "TestWithDelegate",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
-                Name = "TestWithDelegate",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.TypedDelegateTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
-                    Name = "TypedDelegateTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithDelegate,
-        };
-        metadata_TestWithDelegate.UseRuntimeDataGeneration(testSessionId);
+        Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
+        Name = "TypedDelegateTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
+        var __classType = typeof(global::TUnit.TestProject.TypedDelegateTest);
+        var metadata_TestWithDelegate = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TypedDelegateTest>(
+            "TestWithDelegate", "TestWithDelegate", 7,
+            __InvokeTest_TestWithDelegate, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithDelegate", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithDelegate };
     }
     public static global::System.Collections.Generic.IEnumerable<global::TUnit.Core.TestDescriptor> EnumerateTestDescriptors()
@@ -89,45 +69,25 @@ internal static class TUnit_TestProject_TypedDelegateTest__TestSource
     }
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithDelegate(string testSessionId)
     {
-        var metadata = new global::TUnit.Core.TestMetadata<global::TUnit.TestProject.TypedDelegateTest>
-        {
-            TestName = "TestWithDelegate",
-            TestClassType = typeof(global::TUnit.TestProject.TypedDelegateTest),
-            TestMethodName = "TestWithDelegate",
-            Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
-            AttributeFactory = __CreateAttributes_0,
-            DataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
-            PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
-            PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-            InheritanceDepth = 0,
-            FilePath = @"",
-            LineNumber = 7,
-            MethodMetadata = new global::TUnit.Core.MethodMetadata
-            {
-                Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
-                TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
-                Name = "TestWithDelegate",
-                GenericTypeCount = 0,
-                ReturnType = typeof(void),
-                ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
-                Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                Class = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.TypedDelegateTest", new global::TUnit.Core.ClassMetadata
-                {
-                    Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
-                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
-                    Name = "TypedDelegateTest",
-                    Namespace = "TUnit.TestProject",
-                    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-                    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-                    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-                    Parent = null
-                })
-            },
-            InstanceFactory = CreateInstance,
-            InvokeTypedTest = __InvokeTest_TestWithDelegate,
-        };
-        metadata.UseRuntimeDataGeneration(testSessionId);
+        var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.TypedDelegateTest", new global::TUnit.Core.ClassMetadata
+    {
+    Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
+    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
+    Name = "TypedDelegateTest",
+    Namespace = "TUnit.TestProject",
+    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+    Parent = null
+    });
+        var __classType = typeof(global::TUnit.TestProject.TypedDelegateTest);
+        var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TypedDelegateTest>(
+            "TestWithDelegate", "TestWithDelegate", 7,
+            __InvokeTest_TestWithDelegate, __CreateAttributes_0, CreateInstance,
+            global::TUnit.Core.MethodMetadataFactory.Create("TestWithDelegate", __classType, typeof(void), __classMetadata),
+            filePath: @"",
+            testSessionId: testSessionId
+        );
         return new global::TUnit.Core.TestMetadata[] { metadata };
     }
     internal static global::TUnit.TestProject.TypedDelegateTest CreateInstance(global::System.Type[] typeArgs, object?[] args)
diff --git a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
index 66abece697..f7a36b4848 100644
--- a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
+++ b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
@@ -11,6 +11,7 @@
 using TUnit.Core.SourceGenerator.Extensions;
 using TUnit.Core.SourceGenerator.Helpers;
 using TUnit.Core.SourceGenerator.Models;
+using TUnit.Core.SourceGenerator.Utilities;
 
 namespace TUnit.Core.SourceGenerator.Generators;
 
@@ -2425,7 +2426,8 @@ private static void GenerateModuleInitializer(CodeWriter writer, TestMethodMetad
 
     /// <summary>
     /// Pre-generates the metadata block for one method's contribution to GetTests().
-    /// Output: var metadata_{id} = new TestMetadata&lt;T&gt; { ... }; metadata_{id}.UseRuntimeDataGeneration(...);
+    /// Uses TestMetadataFactory.Create and MethodMetadataFactory.Create to reduce JIT native code.
+    /// References shared locals (__classMetadata, __classType) declared at top of GetTests().
     /// </summary>
     private static string PreGenerateMetadataBlock(
         TestMethodMetadata testMethod,
@@ -2434,42 +2436,29 @@ private static string PreGenerateMetadataBlock(
         int attributeGroupIndex)
     {
         var writer = new CodeWriter(includeHeader: false);
+        var methodName = testMethod.MethodSymbol.Name;
+        var filePath = (testMethod.FilePath ?? "").Replace("\\", "\\\\");
 
-        writer.AppendLine($"var metadata_{methodId} = new global::TUnit.Core.TestMetadata<{className}>");
-        writer.AppendLine("{");
-        writer.Indent();
-
-        writer.AppendLine($"TestName = \"{testMethod.MethodSymbol.Name}\",");
-        writer.AppendLine($"TestClassType = typeof({className}),");
-        writer.AppendLine($"TestMethodName = \"{testMethod.MethodSymbol.Name}\",");
+        // Build MethodMetadata factory call
+        var methodMetadataCall = GenerateMethodMetadataFactoryCall(testMethod.MethodSymbol);
 
-        // Reuse existing helper methods that write to CodeWriter
-        GenerateDependencies(writer, testMethod.MethodSymbol);
-        writer.AppendLine($"AttributeFactory = __CreateAttributes_{attributeGroupIndex},");
-        GenerateDataSources(writer, testMethod);
-        GeneratePropertyInjections(writer, testMethod.TypeSymbol, className);
-        writer.AppendLine("InheritanceDepth = 0,");
-        writer.AppendLine($"FilePath = @\"{(testMethod.FilePath ?? "").Replace("\\", "\\\\")}\",");
-        writer.AppendLine($"LineNumber = {testMethod.LineNumber},");
+        // Start TestMetadataFactory.Create call
+        writer.AppendLine($"var metadata_{methodId} = global::TUnit.Core.TestMetadataFactory.Create<{className}>(");
+        writer.Indent();
+        writer.AppendLine($"\"{methodName}\", \"{methodName}\", {testMethod.LineNumber},");
+        writer.AppendLine($"__InvokeTest_{methodId}, __CreateAttributes_{attributeGroupIndex}, CreateInstance,");
+        writer.Append(methodMetadataCall);
 
-        // MethodMetadata
-        var compilation = testMethod.Context!.Value.SemanticModel.Compilation;
-        writer.Append("MethodMetadata = ");
-        SourceInformationWriter.GenerateMethodInformation(writer, compilation, testMethod.TypeSymbol, testMethod.MethodSymbol, null, ',');
+        // Add optional named parameters only when non-default
+        AppendOptionalFactoryParameters(writer, testMethod, className);
 
-        writer.AppendLine($"InstanceFactory = CreateInstance,");
-        writer.AppendLine($"InvokeTypedTest = __InvokeTest_{methodId},");
-
-        // RepeatCount
-        var repeatCount = ExtractRepeatCount(testMethod.MethodSymbol, testMethod.TypeSymbol);
-        if (repeatCount.HasValue)
-        {
-            writer.AppendLine($"RepeatCount = {repeatCount.Value},");
-        }
+        // Always emit filePath (it's almost never empty)
+        writer.AppendLine(",");
+        writer.AppendLine($"filePath: @\"{filePath}\",");
+        writer.Append("testSessionId: testSessionId");
 
         writer.Unindent();
-        writer.AppendLine("};");
-        writer.AppendLine($"metadata_{methodId}.UseRuntimeDataGeneration(testSessionId);");
+        writer.AppendLine(");");
 
         return writer.ToString();
     }
@@ -2551,6 +2540,7 @@ private static string PreGenerateInvokeTestMethod(TestMethodMetadata testMethod,
     /// <summary>
     /// Pre-generates the full __Materialize_{id} static method.
     /// This is only called when --treenode-filter is used (never JIT'd in normal runs).
+    /// Uses factory calls for consistency, with inline shared locals (since this is a separate method).
     /// </summary>
     private static string PreGenerateMaterializerMethod(
         TestMethodMetadata testMethod,
@@ -2564,39 +2554,33 @@ private static string PreGenerateMaterializerMethod(
         writer.AppendLine("{");
         writer.Indent();
 
-        // Same metadata as in GetTests, but with a simple 'metadata' variable name
-        writer.AppendLine($"var metadata = new global::TUnit.Core.TestMetadata<{className}>");
-        writer.AppendLine("{");
-        writer.Indent();
+        var methodName = testMethod.MethodSymbol.Name;
+        var filePath = (testMethod.FilePath ?? "").Replace("\\", "\\\\");
 
-        writer.AppendLine($"TestName = \"{testMethod.MethodSymbol.Name}\",");
-        writer.AppendLine($"TestClassType = typeof({className}),");
-        writer.AppendLine($"TestMethodName = \"{testMethod.MethodSymbol.Name}\",");
+        // Inline shared locals (can't reference GetTests locals from a separate method)
+        var classMetadataExpr = MetadataGenerationHelper.GenerateClassMetadataGetOrAddWithParentExpression(testMethod.TypeSymbol, writer.IndentLevel);
+        writer.AppendLine($"var __classMetadata = {classMetadataExpr};");
+        writer.AppendLine($"var __classType = typeof({className});");
 
-        GenerateDependencies(writer, testMethod.MethodSymbol);
-        writer.AppendLine($"AttributeFactory = __CreateAttributes_{attributeGroupIndex},");
-        GenerateDataSources(writer, testMethod);
-        GeneratePropertyInjections(writer, testMethod.TypeSymbol, className);
-        writer.AppendLine("InheritanceDepth = 0,");
-        writer.AppendLine($"FilePath = @\"{(testMethod.FilePath ?? "").Replace("\\", "\\\\")}\",");
-        writer.AppendLine($"LineNumber = {testMethod.LineNumber},");
+        // Build MethodMetadata factory call
+        var methodMetadataCall = GenerateMethodMetadataFactoryCall(testMethod.MethodSymbol);
 
-        var compilation = testMethod.Context!.Value.SemanticModel.Compilation;
-        writer.Append("MethodMetadata = ");
-        SourceInformationWriter.GenerateMethodInformation(writer, compilation, testMethod.TypeSymbol, testMethod.MethodSymbol, null, ',');
+        // TestMetadataFactory.Create call
+        writer.AppendLine($"var metadata = global::TUnit.Core.TestMetadataFactory.Create<{className}>(");
+        writer.Indent();
+        writer.AppendLine($"\"{methodName}\", \"{methodName}\", {testMethod.LineNumber},");
+        writer.AppendLine($"__InvokeTest_{methodId}, __CreateAttributes_{attributeGroupIndex}, CreateInstance,");
+        writer.Append(methodMetadataCall);
 
-        writer.AppendLine($"InstanceFactory = CreateInstance,");
-        writer.AppendLine($"InvokeTypedTest = __InvokeTest_{methodId},");
+        // Add optional named parameters
+        AppendOptionalFactoryParameters(writer, testMethod, className);
 
-        var repeatCount = ExtractRepeatCount(testMethod.MethodSymbol, testMethod.TypeSymbol);
-        if (repeatCount.HasValue)
-        {
-            writer.AppendLine($"RepeatCount = {repeatCount.Value},");
-        }
+        writer.AppendLine(",");
+        writer.AppendLine($"filePath: @\"{filePath}\",");
+        writer.Append("testSessionId: testSessionId");
 
         writer.Unindent();
-        writer.AppendLine("};");
-        writer.AppendLine("metadata.UseRuntimeDataGeneration(testSessionId);");
+        writer.AppendLine(");");
         writer.AppendLine("return new global::TUnit.Core.TestMetadata[] { metadata };");
 
         writer.Unindent();
@@ -2623,6 +2607,320 @@ private static string PreGenerateAttributeFactoryBody(TestMethodMetadata testMet
         return writer.ToString();
     }
 
+    /// <summary>
+    /// Pre-generates shared local variable declarations for the top of GetTests().
+    /// Generates __classMetadata and __classType locals that are referenced by factory calls.
+    /// </summary>
+    private static string PreGenerateSharedLocals(INamedTypeSymbol typeSymbol, string className)
+    {
+        var writer = new CodeWriter(includeHeader: false);
+        var classMetadataExpr = MetadataGenerationHelper.GenerateClassMetadataGetOrAddWithParentExpression(typeSymbol, writer.IndentLevel);
+        writer.AppendLine($"var __classMetadata = {classMetadataExpr};");
+        writer.AppendLine($"var __classType = typeof({className});");
+        return writer.ToString();
+    }
+
+    /// <summary>
+    /// Generates a MethodMetadataFactory.Create(...) call expression referencing __classType and __classMetadata.
+    /// </summary>
+    private static string GenerateMethodMetadataFactoryCall(IMethodSymbol methodSymbol)
+    {
+        var returnType = methodSymbol.ReturnType.GloballyQualified();
+        var sb = new System.Text.StringBuilder();
+        sb.Append($"global::TUnit.Core.MethodMetadataFactory.Create(\"{methodSymbol.Name}\", __classType, typeof({returnType}), __classMetadata");
+
+        if (methodSymbol.TypeParameters.Length > 0)
+        {
+            sb.Append($", genericTypeCount: {methodSymbol.TypeParameters.Length}");
+        }
+
+        if (methodSymbol.Parameters.Length > 0)
+        {
+            var paramExpr = MetadataGenerationHelper.GenerateParameterMetadataArrayForMethodExpression(methodSymbol);
+            if (paramExpr != null)
+            {
+                sb.Append($", parameters: {paramExpr}");
+            }
+        }
+
+        sb.Append(')');
+        return sb.ToString();
+    }
+
+    /// <summary>
+    /// Appends optional named parameters to a TestMetadataFactory.Create call.
+    /// Only includes parameters that differ from the factory defaults (null/empty).
+    /// </summary>
+    private static void AppendOptionalFactoryParameters(CodeWriter writer, TestMethodMetadata testMethod, string className)
+    {
+        // Dependencies
+        var deps = PreGenerateDependenciesExpression(testMethod.MethodSymbol);
+        if (deps != null)
+        {
+            writer.AppendLine(",");
+            writer.Append($"dependencies: {deps}");
+        }
+
+        // Method-level data sources
+        var methodDS = PreGenerateMethodDataSourcesExpression(testMethod);
+        if (methodDS != null)
+        {
+            writer.AppendLine(",");
+            writer.Append($"dataSources: {methodDS}");
+        }
+
+        // Class-level data sources
+        var classDS = PreGenerateClassDataSourcesExpression(testMethod);
+        if (classDS != null)
+        {
+            writer.AppendLine(",");
+            writer.Append($"classDataSources: {classDS}");
+        }
+
+        // Property data sources
+        var propDS = PreGeneratePropertyDataSourcesExpression(testMethod);
+        if (propDS != null)
+        {
+            writer.AppendLine(",");
+            writer.Append($"propertyDataSources: {propDS}");
+        }
+
+        // Property injections
+        var propInj = PreGeneratePropertyInjectionsExpression(testMethod.TypeSymbol, className);
+        if (propInj != null)
+        {
+            writer.AppendLine(",");
+            writer.Append($"propertyInjections: {propInj}");
+        }
+
+        // RepeatCount
+        var repeatCount = ExtractRepeatCount(testMethod.MethodSymbol, testMethod.TypeSymbol);
+        if (repeatCount.HasValue)
+        {
+            writer.AppendLine(",");
+            writer.Append($"repeatCount: {repeatCount.Value}");
+        }
+    }
+
+    /// <summary>
+    /// Returns a TestDependency[] expression, or null if empty (factory default).
+    /// </summary>
+    private static string? PreGenerateDependenciesExpression(IMethodSymbol methodSymbol)
+    {
+        var dependsOnAttributes = methodSymbol.GetAttributes()
+            .Concat(methodSymbol.ContainingType.GetAttributes())
+            .Where(attr => attr.AttributeClass?.Name == "DependsOnAttribute" &&
+                          attr.AttributeClass.ContainingNamespace?.ToDisplayString() == "TUnit.Core")
+            .ToArray();
+
+        if (dependsOnAttributes.Length == 0)
+        {
+            return null;
+        }
+
+        var writer = new CodeWriter(includeHeader: false);
+        writer.AppendLine("new global::TUnit.Core.TestDependency[]");
+        writer.AppendLine("{");
+        writer.Indent();
+        for (var i = 0; i < dependsOnAttributes.Length; i++)
+        {
+            GenerateTestDependency(writer, dependsOnAttributes[i]);
+            if (i < dependsOnAttributes.Length - 1)
+            {
+                writer.AppendLine(",");
+            }
+        }
+        writer.Unindent();
+        writer.AppendLine();
+        writer.Append("}");
+        return writer.ToString();
+    }
+
+    /// <summary>
+    /// Returns an IDataSourceAttribute[] expression for method-level data sources, or null if empty.
+    /// </summary>
+    private static string? PreGenerateMethodDataSourcesExpression(TestMethodMetadata testMethod)
+    {
+        var methodDataSources = testMethod.MethodSymbol.GetAttributes()
+            .Where(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass))
+            .ToArray();
+
+        if (methodDataSources.Length == 0)
+        {
+            return null;
+        }
+
+        var writer = new CodeWriter(includeHeader: false);
+        writer.AppendLine("new global::TUnit.Core.IDataSourceAttribute[]");
+        writer.AppendLine("{");
+        writer.Indent();
+        foreach (var attr in methodDataSources)
+        {
+            GenerateDataSourceAttribute(writer, testMethod.CompilationContext, attr, testMethod.MethodSymbol, testMethod.TypeSymbol);
+        }
+        writer.Unindent();
+        writer.Append("}");
+        return writer.ToString();
+    }
+
+    /// <summary>
+    /// Returns an IDataSourceAttribute[] expression for class-level data sources, or null if empty.
+    /// </summary>
+    private static string? PreGenerateClassDataSourcesExpression(TestMethodMetadata testMethod)
+    {
+        var classDataSources = testMethod.TypeSymbol.GetAttributesIncludingBaseTypes()
+            .Where(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass))
+            .ToArray();
+
+        if (classDataSources.Length == 0)
+        {
+            return null;
+        }
+
+        var writer = new CodeWriter(includeHeader: false);
+        writer.AppendLine("new global::TUnit.Core.IDataSourceAttribute[]");
+        writer.AppendLine("{");
+        writer.Indent();
+        foreach (var attr in classDataSources)
+        {
+            GenerateDataSourceAttribute(writer, testMethod.CompilationContext, attr, testMethod.MethodSymbol, testMethod.TypeSymbol);
+        }
+        writer.Unindent();
+        writer.Append("}");
+        return writer.ToString();
+    }
+
+    /// <summary>
+    /// Returns a PropertyDataSource[] expression, or null if empty.
+    /// </summary>
+    private static string? PreGeneratePropertyDataSourcesExpression(TestMethodMetadata testMethod)
+    {
+        var typeSymbol = testMethod.TypeSymbol;
+        var processedProperties = new HashSet<string>();
+
+        // Check if any property data sources exist
+        var tempType = typeSymbol;
+        while (tempType != null)
+        {
+            foreach (var member in tempType.GetMembers())
+            {
+                if (member is IPropertySymbol { DeclaredAccessibility: Accessibility.Public, IsStatic: false } property &&
+                    !processedProperties.Contains(property.Name))
+                {
+                    if (property.GetAttributes().Any(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass)))
+                    {
+                        processedProperties.Add(property.Name);
+                    }
+                }
+            }
+            tempType = tempType.BaseType;
+        }
+
+        if (processedProperties.Count == 0)
+        {
+            return null;
+        }
+
+        processedProperties.Clear();
+
+        var writer = new CodeWriter(includeHeader: false);
+        writer.AppendLine("new global::TUnit.Core.PropertyDataSource[]");
+        writer.AppendLine("{");
+        writer.Indent();
+
+        var currentType = typeSymbol;
+        while (currentType != null)
+        {
+            foreach (var member in currentType.GetMembers())
+            {
+                if (member is IPropertySymbol { DeclaredAccessibility: Accessibility.Public, IsStatic: false } property &&
+                    !processedProperties.Contains(property.Name))
+                {
+                    var dataSourceAttr = property.GetAttributes()
+                        .FirstOrDefault(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass));
+
+                    if (dataSourceAttr != null)
+                    {
+                        processedProperties.Add(property.Name);
+                        writer.AppendLine("new global::TUnit.Core.PropertyDataSource");
+                        writer.AppendLine("{");
+                        writer.Indent();
+                        writer.AppendLine($"PropertyName = \"{property.Name}\",");
+                        writer.AppendLine($"PropertyType = typeof({property.Type.GloballyQualified()}),");
+                        writer.Append("DataSource = ");
+                        GenerateDataSourceAttribute(writer, testMethod.CompilationContext, dataSourceAttr, testMethod.MethodSymbol, typeSymbol);
+                        writer.Unindent();
+                        writer.AppendLine("},");
+                    }
+                }
+            }
+            currentType = currentType.BaseType;
+        }
+
+        writer.Unindent();
+        writer.Append("}");
+        return writer.ToString();
+    }
+
+    /// <summary>
+    /// Returns a PropertyInjectionData[] expression, or null if empty.
+    /// </summary>
+    private static string? PreGeneratePropertyInjectionsExpression(INamedTypeSymbol typeSymbol, string className)
+    {
+        var processedProperties = new HashSet<string>();
+
+        // Check if any property injections exist
+        var tempType = typeSymbol;
+        while (tempType != null)
+        {
+            foreach (var member in tempType.GetMembers())
+            {
+                if (member is IPropertySymbol { DeclaredAccessibility: Accessibility.Public, SetMethod.DeclaredAccessibility: Accessibility.Public, IsStatic: false } property &&
+                    !processedProperties.Contains(property.Name))
+                {
+                    if (property.GetAttributes().Any(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass)))
+                    {
+                        processedProperties.Add(property.Name);
+                    }
+                }
+            }
+            tempType = tempType.BaseType;
+        }
+
+        if (processedProperties.Count == 0)
+        {
+            return null;
+        }
+
+        // Use the existing method to generate, then extract the expression
+        processedProperties.Clear();
+        var writer = new CodeWriter(includeHeader: false);
+        GeneratePropertyInjections(writer, typeSymbol, className);
+        var output = writer.ToString().Trim();
+
+        // Output format: "PropertyInjections = <expression>,"
+        // Strip the prefix and trailing comma
+        const string prefix = "PropertyInjections = ";
+        if (!output.StartsWith(prefix))
+        {
+            return null;
+        }
+
+        var expr = output[prefix.Length..].TrimEnd();
+        if (expr.EndsWith(","))
+        {
+            expr = expr[..^1].TrimEnd();
+        }
+
+        // If it's an empty array, return null (use factory default)
+        if (expr.Contains("Array.Empty<"))
+        {
+            return null;
+        }
+
+        return expr;
+    }
+
     /// <summary>
     /// Pre-generates UnsafeAccessor declarations for init-only properties.
     /// Returns empty string if none needed.
@@ -2700,6 +2998,7 @@ private static IEnumerable<ClassTestGroup> GroupMethodsByClass(ImmutableArray<Te
                     AttributeGroups = distinctBodies.ToEquatableArray(),
                     InstanceFactoryBodyCode = InstanceFactoryGenerator.GenerateInstanceFactoryBody(typeSymbol),
                     ReflectionFieldAccessorsCode = PreGenerateReflectionFieldAccessors(typeSymbol),
+                    SharedLocalsCode = PreGenerateSharedLocals(typeSymbol, className),
                 };
             });
     }
@@ -2728,6 +3027,9 @@ private static void GeneratePerClassTestSource(SourceProductionContext context,
             writer.AppendLine("{");
             writer.Indent();
 
+            // Shared locals: __classMetadata and __classType (referenced by factory calls)
+            writer.AppendRaw(classGroup.SharedLocalsCode);
+
             foreach (var method in classGroup.Methods)
             {
                 writer.AppendRaw(method.MetadataCode);
diff --git a/TUnit.Core.SourceGenerator/Models/ClassTestGroup.cs b/TUnit.Core.SourceGenerator/Models/ClassTestGroup.cs
index 377fbf57d0..3540918403 100644
--- a/TUnit.Core.SourceGenerator/Models/ClassTestGroup.cs
+++ b/TUnit.Core.SourceGenerator/Models/ClassTestGroup.cs
@@ -41,4 +41,10 @@ public sealed record ClassTestGroup
     /// Empty string if none needed.
     /// </summary>
     public required string ReflectionFieldAccessorsCode { get; init; }
+
+    /// <summary>
+    /// Pre-generated shared local variable declarations (ClassMetadata, classType)
+    /// emitted once at the top of GetTests().
+    /// </summary>
+    public required string SharedLocalsCode { get; init; }
 }
diff --git a/TUnit.Core.SourceGenerator/Utilities/MetadataGenerationHelper.cs b/TUnit.Core.SourceGenerator/Utilities/MetadataGenerationHelper.cs
index ae2f71ad28..fd6cbe5b0d 100644
--- a/TUnit.Core.SourceGenerator/Utilities/MetadataGenerationHelper.cs
+++ b/TUnit.Core.SourceGenerator/Utilities/MetadataGenerationHelper.cs
@@ -119,6 +119,33 @@ private static void WriteClassMetadataGetOrAdd(ICodeWriter writer, INamedTypeSym
         writer.Append("})");
     }
 
+    /// <summary>
+    /// Generates ClassMetadata with recursive parent as a string expression.
+    /// Used by the per-class path to pre-generate shared locals.
+    /// </summary>
+    public static string GenerateClassMetadataGetOrAddWithParentExpression(INamedTypeSymbol typeSymbol, int indentLevel = 0)
+    {
+        var writer = new CodeWriter("", includeHeader: false).SetIndentLevel(indentLevel);
+        WriteClassMetadataGetOrAddWithParent(writer, typeSymbol);
+        return writer.ToString();
+    }
+
+    /// <summary>
+    /// Generates a ParameterMetadata[] expression for a method's parameters as a string.
+    /// Returns null if the method has no parameters.
+    /// </summary>
+    public static string? GenerateParameterMetadataArrayForMethodExpression(IMethodSymbol method, int indentLevel = 0)
+    {
+        if (method.Parameters.Length == 0)
+        {
+            return null;
+        }
+
+        var writer = new CodeWriter("", includeHeader: false).SetIndentLevel(indentLevel);
+        WriteParameterMetadataArrayForMethod(writer, method);
+        return writer.ToString();
+    }
+
     /// <summary>
     /// Writes ClassMetadata with recursive parent generation for nested types
     /// </summary>
diff --git a/TUnit.Core/MethodMetadataFactory.cs b/TUnit.Core/MethodMetadataFactory.cs
new file mode 100644
index 0000000000..f4c95b4e6e
--- /dev/null
+++ b/TUnit.Core/MethodMetadataFactory.cs
@@ -0,0 +1,34 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace TUnit.Core;
+
+/// <summary>
+/// Factory for creating MethodMetadata instances.
+/// Replaces inline <c>new MethodMetadata { ... }</c> object initializers in generated code,
+/// reducing per-method IL size and JIT-compiled native code.
+/// </summary>
+public static class MethodMetadataFactory
+{
+    [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2067",
+        Justification = "Factory is only called from generated code that always passes concrete types")]
+    public static MethodMetadata Create(
+        string name,
+        Type type,
+        Type returnType,
+        ClassMetadata classMetadata,
+        int genericTypeCount = 0,
+        ParameterMetadata[]? parameters = null)
+    {
+        return new MethodMetadata
+        {
+            Name = name,
+            Type = type,
+            TypeInfo = new ConcreteType(type),
+            GenericTypeCount = genericTypeCount,
+            ReturnType = returnType,
+            ReturnTypeInfo = new ConcreteType(returnType),
+            Parameters = parameters ?? [],
+            Class = classMetadata,
+        };
+    }
+}
diff --git a/TUnit.Core/TestMetadataFactory.cs b/TUnit.Core/TestMetadataFactory.cs
new file mode 100644
index 0000000000..41be5d5041
--- /dev/null
+++ b/TUnit.Core/TestMetadataFactory.cs
@@ -0,0 +1,57 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace TUnit.Core;
+
+/// <summary>
+/// Factory for creating TestMetadata instances.
+/// A single generic method <c>Create&lt;T&gt;() where T : class</c> gets JIT'd once by the .NET runtime
+/// (reference types share native code), so replacing 1,000 inline object initializers with calls
+/// to this shared factory dramatically reduces JIT-compiled native code size.
+/// </summary>
+public static class TestMetadataFactory
+{
+    [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2091",
+        Justification = "Factory is only called from generated code that always passes concrete types")]
+    [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2087",
+        Justification = "Factory is only called from generated code that always passes concrete types")]
+    public static TestMetadata<T> Create<T>(
+        string testName,
+        string testMethodName,
+        int lineNumber,
+        Func<T, object?[], CancellationToken, ValueTask> invokeTypedTest,
+        Func<Attribute[]> attributeFactory,
+        Func<Type[], object?[], T> instanceFactory,
+        MethodMetadata methodMetadata,
+        string filePath = "",
+        int inheritanceDepth = 0,
+        TestDependency[]? dependencies = null,
+        IDataSourceAttribute[]? dataSources = null,
+        IDataSourceAttribute[]? classDataSources = null,
+        PropertyDataSource[]? propertyDataSources = null,
+        PropertyInjectionData[]? propertyInjections = null,
+        int? repeatCount = null,
+        string? testSessionId = null
+    ) where T : class
+    {
+        return new TestMetadata<T>
+        {
+            TestName = testName,
+            TestClassType = typeof(T),
+            TestMethodName = testMethodName,
+            Dependencies = dependencies ?? [],
+            AttributeFactory = attributeFactory,
+            DataSources = dataSources ?? [],
+            ClassDataSources = classDataSources ?? [],
+            PropertyDataSources = propertyDataSources ?? [],
+            PropertyInjections = propertyInjections ?? [],
+            InheritanceDepth = inheritanceDepth,
+            FilePath = filePath,
+            LineNumber = lineNumber,
+            MethodMetadata = methodMetadata,
+            InstanceFactory = instanceFactory,
+            InvokeTypedTest = invokeTypedTest,
+            RepeatCount = repeatCount,
+            TestSessionId = testSessionId ?? Guid.NewGuid().ToString(),
+        };
+    }
+}
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt
index a15f133fe2..4fa0539b0c 100644
--- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt
+++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt
@@ -1023,6 +1023,11 @@ namespace
         public override int GetHashCode() { }
         protected virtual bool PrintMembers(.StringBuilder stringBuilder) { }
     }
+    public static class MethodMetadataFactory
+    {
+        [.("ReflectionAnalysis", "IL2067", Justification="Factory is only called from generated code that always passes concrete types")]
+        public static .MethodMetadata Create(string name,  type,  returnType, .ClassMetadata classMetadata, int genericTypeCount = 0, .ParameterMetadata[]? parameters = null) { }
+    }
     [(.Assembly | .Class | .Method, AllowMultiple=false, Inherited=true)]
     public class NotDiscoverableAttribute : .TUnitAttribute, ., .
     {
@@ -1534,6 +1539,29 @@ namespace
         public required string TestName { get; init; }
         public string TestSessionId { get; set; }
     }
+    public static class TestMetadataFactory
+    {
+        [.("ReflectionAnalysis", "IL2087", Justification="Factory is only called from generated code that always passes concrete types")]
+        [.("ReflectionAnalysis", "IL2091", Justification="Factory is only called from generated code that always passes concrete types")]
+        public static .TestMetadata<T> Create<T>(
+                    string testName,
+                    string testMethodName,
+                    int lineNumber,
+                    <T, object?[], .CancellationToken, .> invokeTypedTest,
+                    <[]> attributeFactory,
+                    <[], object?[], T> instanceFactory,
+                    .MethodMetadata methodMetadata,
+                    string filePath = "",
+                    int inheritanceDepth = 0,
+                    .TestDependency[]? dependencies = null,
+                    .IDataSourceAttribute[]? dataSources = null,
+                    .IDataSourceAttribute[]? classDataSources = null,
+                    .PropertyDataSource[]? propertyDataSources = null,
+                    .PropertyInjectionData[]? propertyInjections = null,
+                    int? repeatCount = default,
+                    string? testSessionId = null)
+            where T :  class { }
+    }
     public class TestMetadata<[.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  T> : .TestMetadata, .
         where T :  class
     {
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt
index b96caf5725..e3ba1bf26d 100644
--- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt
+++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt
@@ -1023,6 +1023,11 @@ namespace
         public override int GetHashCode() { }
         protected virtual bool PrintMembers(.StringBuilder stringBuilder) { }
     }
+    public static class MethodMetadataFactory
+    {
+        [.("ReflectionAnalysis", "IL2067", Justification="Factory is only called from generated code that always passes concrete types")]
+        public static .MethodMetadata Create(string name,  type,  returnType, .ClassMetadata classMetadata, int genericTypeCount = 0, .ParameterMetadata[]? parameters = null) { }
+    }
     [(.Assembly | .Class | .Method, AllowMultiple=false, Inherited=true)]
     public class NotDiscoverableAttribute : .TUnitAttribute, ., .
     {
@@ -1534,6 +1539,29 @@ namespace
         public required string TestName { get; init; }
         public string TestSessionId { get; set; }
     }
+    public static class TestMetadataFactory
+    {
+        [.("ReflectionAnalysis", "IL2087", Justification="Factory is only called from generated code that always passes concrete types")]
+        [.("ReflectionAnalysis", "IL2091", Justification="Factory is only called from generated code that always passes concrete types")]
+        public static .TestMetadata<T> Create<T>(
+                    string testName,
+                    string testMethodName,
+                    int lineNumber,
+                    <T, object?[], .CancellationToken, .> invokeTypedTest,
+                    <[]> attributeFactory,
+                    <[], object?[], T> instanceFactory,
+                    .MethodMetadata methodMetadata,
+                    string filePath = "",
+                    int inheritanceDepth = 0,
+                    .TestDependency[]? dependencies = null,
+                    .IDataSourceAttribute[]? dataSources = null,
+                    .IDataSourceAttribute[]? classDataSources = null,
+                    .PropertyDataSource[]? propertyDataSources = null,
+                    .PropertyInjectionData[]? propertyInjections = null,
+                    int? repeatCount = default,
+                    string? testSessionId = null)
+            where T :  class { }
+    }
     public class TestMetadata<[.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  T> : .TestMetadata, .
         where T :  class
     {
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt
index ffc56362e6..7d49c8e62d 100644
--- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt
+++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt
@@ -1023,6 +1023,11 @@ namespace
         public override int GetHashCode() { }
         protected virtual bool PrintMembers(.StringBuilder stringBuilder) { }
     }
+    public static class MethodMetadataFactory
+    {
+        [.("ReflectionAnalysis", "IL2067", Justification="Factory is only called from generated code that always passes concrete types")]
+        public static .MethodMetadata Create(string name,  type,  returnType, .ClassMetadata classMetadata, int genericTypeCount = 0, .ParameterMetadata[]? parameters = null) { }
+    }
     [(.Assembly | .Class | .Method, AllowMultiple=false, Inherited=true)]
     public class NotDiscoverableAttribute : .TUnitAttribute, ., .
     {
@@ -1534,6 +1539,29 @@ namespace
         public required string TestName { get; init; }
         public string TestSessionId { get; set; }
     }
+    public static class TestMetadataFactory
+    {
+        [.("ReflectionAnalysis", "IL2087", Justification="Factory is only called from generated code that always passes concrete types")]
+        [.("ReflectionAnalysis", "IL2091", Justification="Factory is only called from generated code that always passes concrete types")]
+        public static .TestMetadata<T> Create<T>(
+                    string testName,
+                    string testMethodName,
+                    int lineNumber,
+                    <T, object?[], .CancellationToken, .> invokeTypedTest,
+                    <[]> attributeFactory,
+                    <[], object?[], T> instanceFactory,
+                    .MethodMetadata methodMetadata,
+                    string filePath = "",
+                    int inheritanceDepth = 0,
+                    .TestDependency[]? dependencies = null,
+                    .IDataSourceAttribute[]? dataSources = null,
+                    .IDataSourceAttribute[]? classDataSources = null,
+                    .PropertyDataSource[]? propertyDataSources = null,
+                    .PropertyInjectionData[]? propertyInjections = null,
+                    int? repeatCount = default,
+                    string? testSessionId = null)
+            where T :  class { }
+    }
     public class TestMetadata<[.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  T> : .TestMetadata, .
         where T :  class
     {
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt
index 19c17c6e64..81056f9881 100644
--- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt
+++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt
@@ -985,6 +985,10 @@ namespace
         public override int GetHashCode() { }
         protected virtual bool PrintMembers(.StringBuilder stringBuilder) { }
     }
+    public static class MethodMetadataFactory
+    {
+        public static .MethodMetadata Create(string name,  type,  returnType, .ClassMetadata classMetadata, int genericTypeCount = 0, .ParameterMetadata[]? parameters = null) { }
+    }
     [(.Assembly | .Class | .Method, AllowMultiple=false, Inherited=true)]
     public class NotDiscoverableAttribute : .TUnitAttribute, ., .
     {
@@ -1486,6 +1490,27 @@ namespace
         public required string TestName { get; init; }
         public string TestSessionId { get; set; }
     }
+    public static class TestMetadataFactory
+    {
+        public static .TestMetadata<T> Create<T>(
+                    string testName,
+                    string testMethodName,
+                    int lineNumber,
+                    <T, object?[], .CancellationToken, .> invokeTypedTest,
+                    <[]> attributeFactory,
+                    <[], object?[], T> instanceFactory,
+                    .MethodMetadata methodMetadata,
+                    string filePath = "",
+                    int inheritanceDepth = 0,
+                    .TestDependency[]? dependencies = null,
+                    .IDataSourceAttribute[]? dataSources = null,
+                    .IDataSourceAttribute[]? classDataSources = null,
+                    .PropertyDataSource[]? propertyDataSources = null,
+                    .PropertyInjectionData[]? propertyInjections = null,
+                    int? repeatCount = default,
+                    string? testSessionId = null)
+            where T :  class { }
+    }
     public class TestMetadata<T> : .TestMetadata, .
         where T :  class
     {

From 7a18dfc49dfed15b88690c763bc46cb0a576dc54 Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:18:50 +0000
Subject: [PATCH 2/7] refactor: eliminate string-parsing hack and double
 traversals in source gen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Extract GeneratePropertyInjectionsExpression for direct expression
  generation, replacing fragile prefix-stripping from GeneratePropertyInjections
  output. Fixes silent bug where property injections were dropped in factory path.
- Single-pass type hierarchy traversal in PreGeneratePropertyDataSourcesExpression
  and GeneratePropertyInjectionsExpression (was double-pass).
- Conditional filePath emission — skip filePath: @"" when empty (factory default).
- Add dotnet/runtime issue links to Library.props AD0001 suppression comment.
---
 Library.props                                 |   4 +-
 .../AbstractTests.Concrete2.verified.txt      |   2 -
 .../AfterAllTests.Test.verified.txt           |   4 -
 .../AfterTests.Test.verified.txt              |   4 -
 .../ArgsAsArrayTests.Test.verified.txt        |   6 -
 ...thImplicitConverterTests.Test.verified.txt |   4 -
 ...lyLoaderTests.Test.DotNet10_0.verified.txt |   6 -
 ...blyLoaderTests.Test.DotNet8_0.verified.txt |   6 -
 ...blyLoaderTests.Test.DotNet9_0.verified.txt |   6 -
 ...semblyLoaderTests.Test.Net4_7.verified.txt |   6 -
 ...hodDataSourceDrivenTests.Test.verified.txt |  14 -
 .../AttributeTests.Test.verified.txt          |   2 -
 .../BasicTests.Test.DotNet10_0.verified.txt   |   6 -
 .../BasicTests.Test.DotNet8_0.verified.txt    |   6 -
 .../BasicTests.Test.DotNet9_0.verified.txt    |   6 -
 .../BasicTests.Test.Net4_7.verified.txt       |   6 -
 .../BeforeAllTests.Test.verified.txt          |   4 -
 .../BeforeTests.Test.verified.txt             |   4 -
 ...lableTypeTest.Test.DotNet10_0.verified.txt |   2 -
 ...llableTypeTest.Test.DotNet8_0.verified.txt |   2 -
 ...llableTypeTest.Test.DotNet9_0.verified.txt |   2 -
 ...1NullableTypeTest.Test.Net4_7.verified.txt |   2 -
 ...sAndMethodArgumentsTests.Test.verified.txt |   6 -
 .../ClassConstructorTest.Test.verified.txt    |   2 -
 ...assDataSourceDrivenTests.Test.verified.txt |  14 -
 ...ssDataSourceDrivenTests2.Test.verified.txt |   4 -
 ...ceDrivenTestsSharedKeyed.Test.verified.txt |   4 -
 ...pleDataSourceDrivenTests.Test.verified.txt | 136 +++++-
 .../ConcreteClassTests.Test.verified.txt      |   2 -
 ...nflictingNamespace.DotNet10_0.verified.txt |   6 -
 ...onflictingNamespace.DotNet8_0.verified.txt |   6 -
 ...onflictingNamespace.DotNet9_0.verified.txt |   6 -
 ...thConflictingNamespace.Net4_7.verified.txt |   6 -
 ...nflictingNamespace.DotNet10_0.verified.txt |  20 -
 ...onflictingNamespace.DotNet8_0.verified.txt |  20 -
 ...onflictingNamespace.DotNet9_0.verified.txt |  20 -
 ...thConflictingNamespace.Net4_7.verified.txt |  20 -
 ...nflictingNamespace.DotNet10_0.verified.txt |  26 --
 ...onflictingNamespace.DotNet8_0.verified.txt |  26 --
 ...onflictingNamespace.DotNet9_0.verified.txt |  26 --
 ...thConflictingNamespace.Net4_7.verified.txt |  26 --
 ...nflictingNamespace.DotNet10_0.verified.txt |  14 -
 ...onflictingNamespace.DotNet8_0.verified.txt |  14 -
 ...onflictingNamespace.DotNet9_0.verified.txt |  14 -
 ...thConflictingNamespace.Net4_7.verified.txt |  14 -
 ...nflictingNamespace.DotNet10_0.verified.txt |   2 -
 ...onflictingNamespace.DotNet8_0.verified.txt |   2 -
 ...onflictingNamespace.DotNet9_0.verified.txt |   2 -
 ...thConflictingNamespace.Net4_7.verified.txt |   2 -
 .../ConstantArgumentsTests.Test.verified.txt  |  14 -
 ...ConstantInBaseClassTests.Test.verified.txt |   2 -
 ...InterpolatedStringsTests.Test.verified.txt |   2 -
 .../CustomDisplayNameTests.Test.verified.txt  |  18 -
 .../DataDrivenTests.Test.verified.txt         |  20 -
 ...ithDataSourceMethodTests.Test.verified.txt |   2 -
 ...ataSourceGeneratorTests.Typed.verified.txt |   6 -
 ...aSourceGeneratorTests.Untyped.verified.txt |   2 -
 .../DecimalArgumentTests.Test.verified.txt    |  24 -
 ...nScannerTests.Test.DotNet10_0.verified.txt |   6 -
 ...onScannerTests.Test.DotNet8_0.verified.txt |   6 -
 ...onScannerTests.Test.DotNet9_0.verified.txt |   6 -
 ...ctionScannerTests.Test.Net4_7.verified.txt |   6 -
 .../EnumMemberNamesTests.Test.verified.txt    |   2 -
 ...bleDataSourceDrivenTests.Test.verified.txt |   6 -
 ...pleDataSourceDrivenTests.Test.verified.txt |   2 -
 ...xpectedArgumentTypeTests.Test.verified.txt |   4 -
 ...aSource_Should_Generate_Tests.verified.txt | 414 +++++++++---------
 ...cRegistry_WhenNoGenericsFound.verified.txt |   2 -
 .../Hooks1589.Test.verified.txt               |   2 -
 .../Hooks1594.Test.verified.txt               |   2 -
 ...ritedPropertySetterTests.Test.verified.txt | 396 ++++++++++++-----
 ...romDifferentProjectTests.Test.verified.txt |   8 -
 ...heritsTestsAbstractTests.Test.verified.txt |   2 -
 .../InheritsTestsTests.Test.verified.txt      | 148 ++++---
 .../Issue2887Tests.Test.verified.txt          |   2 -
 .../MatrixTests.Test.verified.txt             |  26 --
 ...hodDataSourceDrivenTests.Test.verified.txt |  14 -
 ...thCancellationTokenTests.Test.verified.txt |   2 -
 ...assDataSourceDrivenTests.Test.verified.txt |   4 -
 .../NameOfArgumentTests.Test.verified.txt     |   2 -
 ...ullableByteArgumentTests.Test.verified.txt |   4 -
 .../NumberArgumentTests.Test.verified.txt     |  12 -
 .../NumberArgumentTests.TestDE.verified.txt   |  12 -
 .../PriorityFilteringTests.Test.verified.txt  |  12 -
 .../PropertySetterTests.Test.verified.txt     | 200 ++++++++-
 ...atTests.Assembly_Level_Repeat.verified.txt |   4 -
 .../RepeatTests.Test.verified.txt             |   6 -
 ...TAThreadTests.Test.DotNet10_0.verified.txt |  30 --
 ...STAThreadTests.Test.DotNet8_0.verified.txt |  30 --
 ...STAThreadTests.Test.DotNet9_0.verified.txt |  30 --
 .../STAThreadTests.Test.Net4_7.verified.txt   |  30 --
 .../StringArgumentTests.Test.verified.txt     |   4 -
 .../Tests.Test.verified.txt                   |   6 -
 .../Tests1538.Test.verified.txt               |   4 -
 .../Tests1539.Test.verified.txt               |   2 -
 .../Tests1589.Test.verified.txt               |   2 -
 .../Tests1594.Test.verified.txt               |   2 -
 .../Tests1603.Test.verified.txt               |   4 -
 .../Tests1692.Test.verified.txt               |   2 -
 .../Tests1821.Test.verified.txt               |   4 -
 .../Tests2083.Test.verified.txt               |   2 -
 .../Tests2085.Test.verified.txt               |   4 -
 .../Tests2112.Test.verified.txt               |   4 -
 ...utCancellationTokenTests.Test.verified.txt |  16 -
 ...pleDataSourceDrivenTests.Test.verified.txt |   2 -
 ...st_AotSafeDataSourceFactories.verified.txt |   2 -
 ...sts.Test_ConfigurationSupport.verified.txt |   2 -
 ..._ModuleInitializer_Generation.verified.txt |   2 -
 ...nglyTypedDelegates_Generation.verified.txt |   2 -
 .../Generators/TestMetadataGenerator.cs       | 345 ++++++---------
 110 files changed, 1069 insertions(+), 1408 deletions(-)

diff --git a/Library.props b/Library.props
index 72689137dc..29e5e9ecae 100644
--- a/Library.props
+++ b/Library.props
@@ -7,7 +7,9 @@
         <TrimmerSingleWarn>false</TrimmerSingleWarn>
 
         <!-- Suppress AD0001 analyzer crash in .NET 9 ILLink DynamicallyAccessedMembersAnalyzer.
-             This is a known .NET 9 SDK analyzer bug, not a code issue. -->
+             This is a known .NET 9 SDK analyzer bug, not a code issue.
+             See: https://github.com/dotnet/runtime/issues/109352
+                  https://github.com/dotnet/runtime/issues/120728 -->
         <NoWarn Condition="'$(TargetFramework)' == 'net9.0'">$(NoWarn);AD0001</NoWarn>
 
         <IsAotCompatible
diff --git a/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt b/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
index de8866edfc..3cd29a32aa 100644
--- a/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
             "SecondTest", "SecondTest", 11,
             __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SecondTest };
@@ -87,7 +86,6 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
             "SecondTest", "SecondTest", 11,
             __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
index 923c021e2e..c24de70073 100644
--- a/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
@@ -25,14 +25,12 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
             "Test1", "Test1", 98,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
             "Test2", "Test2", 104,
             __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
@@ -117,7 +115,6 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
             "Test1", "Test1", 98,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -140,7 +137,6 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
             "Test2", "Test2", 104,
             __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
index 923c021e2e..c24de70073 100644
--- a/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
@@ -25,14 +25,12 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
             "Test1", "Test1", 98,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
             "Test2", "Test2", 104,
             __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
@@ -117,7 +115,6 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
             "Test1", "Test1", 98,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -140,7 +137,6 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
             "Test2", "Test2", 104,
             __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
index aef01e66b1..9dc0aea192 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ParamsEnumerable__IEnumerable_string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
@@ -58,7 +57,6 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Following_Non_Params__int_IEnumerable_string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
@@ -85,7 +83,6 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1, "arg1", "arg2", "arg3"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Params__string__, metadata_ParamsEnumerable__IEnumerable_string_, metadata_Following_Non_Params__int_IEnumerable_string_ };
@@ -326,7 +323,6 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -362,7 +358,6 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -405,7 +400,6 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1, "arg1", "arg2", "arg3"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
index d361a4c157..313240d7fd 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
@@ -40,7 +40,6 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
             new global::TUnit.Core.ArgumentsAttribute(2),
             new global::TUnit.Core.ArgumentsAttribute(3),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Implicit__ImplicitInteger = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
@@ -62,7 +61,6 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
             new global::TUnit.Core.ArgumentsAttribute(2),
             new global::TUnit.Core.ArgumentsAttribute(3),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Explicit__ExplicitInteger, metadata_Implicit__ImplicitInteger };
@@ -181,7 +179,6 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
         new global::TUnit.Core.ArgumentsAttribute(2),
         new global::TUnit.Core.ArgumentsAttribute(3),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -219,7 +216,6 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
         new global::TUnit.Core.ArgumentsAttribute(2),
         new global::TUnit.Core.ArgumentsAttribute(3),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
index edbb68244a..042b626d69 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
index c6e42dfe10..8e5c3a175b 100644
--- a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
@@ -59,7 +59,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsyncMethodDataSource_Tuples__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -107,7 +106,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsyncMethodDataSource_Enumerable__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -148,7 +146,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsyncMethodDataSource_Func__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -189,7 +186,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsyncMethodDataSource_WithArguments__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -230,7 +226,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsyncMethodDataSource_ExternalClass__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -271,7 +266,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskMethodDataSource_SingleValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -312,7 +306,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_AsyncMethodDataSource_SingleValue__int, metadata_AsyncMethodDataSource_Tuples__int_string, metadata_AsyncMethodDataSource_Enumerable__int, metadata_AsyncMethodDataSource_Func__int, metadata_AsyncMethodDataSource_WithArguments__int, metadata_AsyncMethodDataSource_ExternalClass__string, metadata_ValueTaskMethodDataSource_SingleValue__int };
@@ -618,7 +611,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -682,7 +674,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -739,7 +730,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -796,7 +786,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -853,7 +842,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -910,7 +898,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -967,7 +954,6 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
index 89e15f31ea..fb090c7577 100644
--- a/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_AttributeTests__TestSource
             "MyTest", "MyTest", 7,
             __InvokeTest_MyTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("MyTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_MyTest };
@@ -97,7 +96,6 @@ internal static class TUnit_TestProject_AttributeTests__TestSource
             "MyTest", "MyTest", 7,
             __InvokeTest_MyTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("MyTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
index edbb68244a..042b626d69 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
index ff76da63bb..6f345a5314 100644
--- a/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
@@ -25,14 +25,12 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
             "Test1", "Test1", 98,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
             "Test2", "Test2", 104,
             __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
@@ -117,7 +115,6 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
             "Test1", "Test1", 98,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -140,7 +137,6 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
             "Test2", "Test2", 104,
             __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
index ff76da63bb..6f345a5314 100644
--- a/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
@@ -25,14 +25,12 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
             "Test1", "Test1", 98,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
             "Test2", "Test2", 104,
             __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
@@ -117,7 +115,6 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
             "Test1", "Test1", 98,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -140,7 +137,6 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
             "Test2", "Test2", 104,
             __InvokeTest_Test2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
index dcb30ef2b0..8f22ff8451 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
             "SimpleTest", "SimpleTest", 19,
             __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SimpleTest };
@@ -86,7 +85,6 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
             "SimpleTest", "SimpleTest", 19,
             __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
index dcb30ef2b0..8f22ff8451 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
             "SimpleTest", "SimpleTest", 19,
             __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SimpleTest };
@@ -86,7 +85,6 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
             "SimpleTest", "SimpleTest", 19,
             __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
index dcb30ef2b0..8f22ff8451 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
             "SimpleTest", "SimpleTest", 19,
             __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SimpleTest };
@@ -86,7 +85,6 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
             "SimpleTest", "SimpleTest", 19,
             __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
index 0ef8deadcb..3809c8651e 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
             "SimpleTest", "SimpleTest", 19,
             __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SimpleTest };
@@ -86,7 +85,6 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
             "SimpleTest", "SimpleTest", 19,
             __InvokeTest_SimpleTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SimpleTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
index 46d324f7ab..0e587ac3ac 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
@@ -39,7 +39,6 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute("1"),
             new global::TUnit.Core.ArgumentsAttribute("2"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_WithMethodLevel__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
@@ -65,7 +64,6 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute("1"),
             new global::TUnit.Core.ArgumentsAttribute("2"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IgnoreParameters__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
@@ -91,7 +89,6 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute("1"),
             new global::TUnit.Core.ArgumentsAttribute("2"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Simple, metadata_WithMethodLevel__string, metadata_IgnoreParameters__string };
@@ -234,7 +231,6 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute("1"),
         new global::TUnit.Core.ArgumentsAttribute("2"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -285,7 +281,6 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute("1"),
         new global::TUnit.Core.ArgumentsAttribute("2"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -336,7 +331,6 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute("1"),
         new global::TUnit.Core.ArgumentsAttribute("2"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
index a22f422022..365cd4f1ac 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
@@ -47,7 +47,6 @@ internal static class TUnit_TestProject_ClassConstructorTest__TestSource
             "Test", "Test", 8,
             __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test };
@@ -130,7 +129,6 @@ internal static class TUnit_TestProject_ClassConstructorTest__TestSource
             "Test", "Test", 8,
             __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
index 05f7b06516..b48bfb63ec 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
         {
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Class_Generic__SomeAsyncDisposableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -58,7 +57,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
         {
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IsInitialized_With_1_ClassDataSource__InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -78,7 +76,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
         {
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -105,7 +102,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
         {
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -139,7 +135,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
         {
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -180,7 +175,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
         {
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -228,7 +222,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
         {
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Class__SomeAsyncDisposableClass, metadata_DataSource_Class_Generic__SomeAsyncDisposableClass, metadata_IsInitialized_With_1_ClassDataSource__InitializableClass, metadata_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass, metadata_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass, metadata_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass, metadata_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass };
@@ -515,7 +508,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -551,7 +543,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -587,7 +578,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -630,7 +620,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -680,7 +669,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -737,7 +725,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -801,7 +788,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass, global::TUnit.TestProject.Library.Models.InitializableClass>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
index 86ed2c4585..f2442c49dc 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
@@ -39,7 +39,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Base_Derived2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
@@ -51,7 +50,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Base_Derived1, metadata_Base_Derived2 };
@@ -155,7 +153,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -192,7 +189,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived1>(),
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.ClassDataSourceDrivenTests2.Derived2>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
index 4e03f6bed3..77b6520007 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
@@ -39,7 +39,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
         {Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Class_Generic__SomeAsyncDisposableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
@@ -60,7 +59,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
         {Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Class__SomeAsyncDisposableClass, metadata_DataSource_Class_Generic__SomeAsyncDisposableClass };
@@ -178,7 +176,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
     {Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -215,7 +212,6 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>()
     {Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
index 0a98a50d07..e630f7c776 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
@@ -252,7 +252,73 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
                 },
             },
         },
-            filePath: @"",
+            propertyInjections: new global::TUnit.Core.PropertyInjectionData[]
+        {
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property1",
+                PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty1BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property2",
+                PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property3",
+                PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property4",
+                PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+        },
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
@@ -540,7 +606,73 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
             },
         },
     },
-            filePath: @"",
+            propertyInjections: new global::TUnit.Core.PropertyInjectionData[]
+    {
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property1",
+            PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty1BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property2",
+            PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property3",
+            PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property4",
+            PropertyType = typeof(global::System.ValueTuple<int, string, bool>),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)instance) = (global::System.ValueTuple<int, string, bool>)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+    },
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
index de8866edfc..3cd29a32aa 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
             "SecondTest", "SecondTest", 11,
             __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SecondTest };
@@ -87,7 +86,6 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
             "SecondTest", "SecondTest", 11,
             __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
index edbb68244a..042b626d69 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
index f7ca22ba22..82edafbb6e 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -40,7 +40,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2),
             new global::TUnit.Core.ArgumentsAttribute(3),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -69,7 +68,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
             new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -91,7 +89,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
             new global::TUnit.Core.ArgumentsAttribute(-1),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -111,7 +108,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -131,7 +127,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(""),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -151,7 +146,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -173,7 +167,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(false),
             new global::TUnit.Core.ArgumentsAttribute(true),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -193,7 +186,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -213,7 +205,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -233,7 +224,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(2147483647),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
@@ -632,7 +622,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2),
         new global::TUnit.Core.ArgumentsAttribute(3),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -677,7 +666,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
         new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -715,7 +703,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
         new global::TUnit.Core.ArgumentsAttribute(-1),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -751,7 +738,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -787,7 +773,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(""),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -823,7 +808,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -861,7 +845,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(false),
         new global::TUnit.Core.ArgumentsAttribute(true),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -897,7 +880,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -933,7 +915,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -969,7 +950,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(2147483647),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
index f7ca22ba22..82edafbb6e 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -40,7 +40,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2),
             new global::TUnit.Core.ArgumentsAttribute(3),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -69,7 +68,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
             new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -91,7 +89,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
             new global::TUnit.Core.ArgumentsAttribute(-1),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -111,7 +108,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -131,7 +127,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(""),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -151,7 +146,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -173,7 +167,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(false),
             new global::TUnit.Core.ArgumentsAttribute(true),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -193,7 +186,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -213,7 +205,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -233,7 +224,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(2147483647),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
@@ -632,7 +622,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2),
         new global::TUnit.Core.ArgumentsAttribute(3),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -677,7 +666,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
         new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -715,7 +703,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
         new global::TUnit.Core.ArgumentsAttribute(-1),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -751,7 +738,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -787,7 +773,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(""),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -823,7 +808,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -861,7 +845,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(false),
         new global::TUnit.Core.ArgumentsAttribute(true),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -897,7 +880,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -933,7 +915,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -969,7 +950,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(2147483647),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
index f7ca22ba22..82edafbb6e 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -40,7 +40,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2),
             new global::TUnit.Core.ArgumentsAttribute(3),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -69,7 +68,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
             new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -91,7 +89,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
             new global::TUnit.Core.ArgumentsAttribute(-1),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -111,7 +108,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -131,7 +127,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(""),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -151,7 +146,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -173,7 +167,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(false),
             new global::TUnit.Core.ArgumentsAttribute(true),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -193,7 +186,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -213,7 +205,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -233,7 +224,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(2147483647),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
@@ -632,7 +622,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2),
         new global::TUnit.Core.ArgumentsAttribute(3),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -677,7 +666,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
         new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -715,7 +703,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
         new global::TUnit.Core.ArgumentsAttribute(-1),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -751,7 +738,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -787,7 +773,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(""),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -823,7 +808,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -861,7 +845,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(false),
         new global::TUnit.Core.ArgumentsAttribute(true),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -897,7 +880,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -933,7 +915,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -969,7 +950,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(2147483647),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
index 7c08a2d311..863140a2af 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -40,7 +40,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2),
             new global::TUnit.Core.ArgumentsAttribute(3),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -69,7 +68,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
             new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -91,7 +89,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
             new global::TUnit.Core.ArgumentsAttribute(-1),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -111,7 +108,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -131,7 +127,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(""),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -151,7 +146,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -173,7 +167,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(false),
             new global::TUnit.Core.ArgumentsAttribute(true),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -193,7 +186,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -213,7 +205,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -233,7 +224,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(2147483647),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
@@ -632,7 +622,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2),
         new global::TUnit.Core.ArgumentsAttribute(3),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -677,7 +666,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
         new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -715,7 +703,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
         new global::TUnit.Core.ArgumentsAttribute(-1),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -751,7 +738,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -787,7 +773,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(""),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -823,7 +808,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -861,7 +845,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(false),
         new global::TUnit.Core.ArgumentsAttribute(true),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -897,7 +880,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -933,7 +915,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -969,7 +950,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(2147483647),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
index 28e629be6d..121b1cb82a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -52,7 +52,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -93,7 +92,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -127,7 +125,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -154,7 +151,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -181,7 +177,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -208,7 +203,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -235,7 +229,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -255,7 +248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -275,7 +267,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -295,7 +286,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -315,7 +305,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -342,7 +331,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -369,7 +357,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
@@ -883,7 +870,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -940,7 +926,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -990,7 +975,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1033,7 +1017,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1076,7 +1059,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1119,7 +1101,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1162,7 +1143,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1198,7 +1178,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1234,7 +1213,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1270,7 +1248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1306,7 +1283,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1349,7 +1325,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1392,7 +1367,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
index 28e629be6d..121b1cb82a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -52,7 +52,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -93,7 +92,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -127,7 +125,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -154,7 +151,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -181,7 +177,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -208,7 +203,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -235,7 +229,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -255,7 +248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -275,7 +267,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -295,7 +286,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -315,7 +305,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -342,7 +331,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -369,7 +357,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
@@ -883,7 +870,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -940,7 +926,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -990,7 +975,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1033,7 +1017,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1076,7 +1059,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1119,7 +1101,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1162,7 +1143,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1198,7 +1178,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1234,7 +1213,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1270,7 +1248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1306,7 +1283,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1349,7 +1325,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1392,7 +1367,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
index 28e629be6d..121b1cb82a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -52,7 +52,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -93,7 +92,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -127,7 +125,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -154,7 +151,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -181,7 +177,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -208,7 +203,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -235,7 +229,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -255,7 +248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -275,7 +267,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -295,7 +286,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -315,7 +305,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -342,7 +331,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -369,7 +357,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
@@ -883,7 +870,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -940,7 +926,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -990,7 +975,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1033,7 +1017,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1076,7 +1059,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1119,7 +1101,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1162,7 +1143,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1198,7 +1178,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1234,7 +1213,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1270,7 +1248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1306,7 +1283,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1349,7 +1325,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1392,7 +1367,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
index a04ba00a0f..60f69d5bc7 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -52,7 +52,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -93,7 +92,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -127,7 +125,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -154,7 +151,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -181,7 +177,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -208,7 +203,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -235,7 +229,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -255,7 +248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -275,7 +267,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -295,7 +286,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -315,7 +305,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -342,7 +331,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -369,7 +357,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
@@ -883,7 +870,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -940,7 +926,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -990,7 +975,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1033,7 +1017,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1076,7 +1059,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1119,7 +1101,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1162,7 +1143,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1198,7 +1178,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1234,7 +1213,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1270,7 +1248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1306,7 +1283,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1349,7 +1325,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1392,7 +1367,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
index d844a9b12c..c6d3714cea 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -49,7 +49,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -80,7 +79,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -111,7 +109,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -157,7 +154,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -230,7 +226,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -261,7 +256,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -302,7 +296,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
@@ -604,7 +597,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -651,7 +643,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -698,7 +689,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -760,7 +750,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -849,7 +838,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -896,7 +884,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -953,7 +940,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
index d844a9b12c..c6d3714cea 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -49,7 +49,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -80,7 +79,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -111,7 +109,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -157,7 +154,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -230,7 +226,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -261,7 +256,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -302,7 +296,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
@@ -604,7 +597,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -651,7 +643,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -698,7 +689,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -760,7 +750,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -849,7 +838,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -896,7 +884,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -953,7 +940,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
index d844a9b12c..c6d3714cea 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -49,7 +49,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -80,7 +79,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -111,7 +109,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -157,7 +154,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -230,7 +226,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -261,7 +256,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -302,7 +296,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
@@ -604,7 +597,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -651,7 +643,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -698,7 +689,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -760,7 +750,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -849,7 +838,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -896,7 +884,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -953,7 +940,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
index 4a0380760c..1d0c7189e2 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
@@ -49,7 +49,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -80,7 +79,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -111,7 +109,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -157,7 +154,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -230,7 +226,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -261,7 +256,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -302,7 +296,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
@@ -604,7 +597,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -651,7 +643,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -698,7 +689,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -760,7 +750,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -849,7 +838,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -896,7 +884,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -953,7 +940,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
index 8f2f20ebcf..939ca1980a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -63,7 +63,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
@@ -170,7 +169,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
index 8f2f20ebcf..939ca1980a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -63,7 +63,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
@@ -170,7 +169,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
index 8f2f20ebcf..939ca1980a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -63,7 +63,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
@@ -170,7 +169,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
index a651380f8a..5cb3b0cf76 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
@@ -63,7 +63,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
@@ -170,7 +169,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
index c17fef5f2a..a19acc04d1 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("123"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Int__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -58,7 +57,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(123),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Double__double = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -78,7 +76,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1.23d),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Float__float = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -98,7 +95,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1.23000002f),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Long__long = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -118,7 +114,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(123L),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_UInt__uint = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -138,7 +133,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(123U),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ULong__ulong = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -158,7 +152,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(123UL),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_String1__string, metadata_Int__int, metadata_Double__double, metadata_Float__float, metadata_Long__long, metadata_UInt__uint, metadata_ULong__ulong };
@@ -443,7 +436,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("123"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -479,7 +471,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(123),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -515,7 +506,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1.23d),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -551,7 +541,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1.23000002f),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -587,7 +576,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(123L),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -623,7 +611,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(123U),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -659,7 +646,6 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(123UL),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
index b943473e1d..6be2143395 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantInBaseClassTests__Tes
         {
             new global::TUnit.Core.ArgumentsAttribute("Value"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SomeTest__string };
@@ -119,7 +118,6 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantInBaseClassTests__Tes
     {
         new global::TUnit.Core.ArgumentsAttribute("Value"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
index 59182ef402..32610f1c6d 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantsInInterpolatedString
         {
             new global::TUnit.Core.ArgumentsAttribute($"{"Value"}1"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SomeTest__string };
@@ -119,7 +118,6 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantsInInterpolatedString
     {
         new global::TUnit.Core.ArgumentsAttribute($"{"Value"}1"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
index 5a6d465f88..04ac0b7296 100644
--- a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
@@ -38,14 +38,12 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
             "Test", "Test", 11,
             __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "Test2", "Test2", 18,
             __InvokeTest_Test2, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test3__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -80,7 +78,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute("foo", 1, true),
             new global::TUnit.Core.ArgumentsAttribute("bar", 2, false),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MethodDataSourceTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -111,7 +108,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_TestParameterNamePrefixBug__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -140,7 +136,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(200, "Type2"),
             new global::TUnit.Core.ArgumentsAttribute(300, "Type1"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_PasswordTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -160,28 +155,24 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
         {
             new global::TUnit.TestProject.CustomDisplayNameTests.MyGenerator(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_SameClassConstantTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "SameClassConstantTest", "SameClassConstantTest", 72,
             __InvokeTest_SameClassConstantTest, __CreateAttributes_6, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SameClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DifferentClassConstantTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "DifferentClassConstantTest", "DifferentClassConstantTest", 79,
             __InvokeTest_DifferentClassConstantTest, __CreateAttributes_6, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("DifferentClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NestedClassConstantTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "NestedClassConstantTest", "NestedClassConstantTest", 86,
             __InvokeTest_NestedClassConstantTest, __CreateAttributes_6, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("NestedClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test, metadata_Test2, metadata_Test3__string_int_bool, metadata_MethodDataSourceTest__string, metadata_TestParameterNamePrefixBug__int_string, metadata_PasswordTest__string, metadata_SameClassConstantTest, metadata_DifferentClassConstantTest, metadata_NestedClassConstantTest };
@@ -548,7 +539,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
             "Test", "Test", 11,
             __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -584,7 +574,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
             "Test2", "Test2", 18,
             __InvokeTest_Test2, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -648,7 +637,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute("foo", 1, true),
         new global::TUnit.Core.ArgumentsAttribute("bar", 2, false),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -708,7 +696,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -766,7 +753,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(200, "Type2"),
         new global::TUnit.Core.ArgumentsAttribute(300, "Type1"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -815,7 +801,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         new global::TUnit.TestProject.CustomDisplayNameTests.MyGenerator(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -851,7 +836,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
             "SameClassConstantTest", "SameClassConstantTest", 72,
             __InvokeTest_SameClassConstantTest, __CreateAttributes_6, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SameClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -887,7 +871,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
             "DifferentClassConstantTest", "DifferentClassConstantTest", 79,
             __InvokeTest_DifferentClassConstantTest, __CreateAttributes_6, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("DifferentClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -923,7 +906,6 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
             "NestedClassConstantTest", "NestedClassConstantTest", 86,
             __InvokeTest_NestedClassConstantTest, __CreateAttributes_6, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("NestedClassConstantTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
index 7c08a2d311..863140a2af 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
@@ -40,7 +40,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2),
             new global::TUnit.Core.ArgumentsAttribute(3),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method__int_string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -69,7 +68,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
             new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumValue__TestEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -91,7 +89,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
             new global::TUnit.Core.ArgumentsAttribute(-1),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NullValue__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -111,7 +108,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -131,7 +127,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(""),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NonEmptyString__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -151,7 +146,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_BooleanString__bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -173,7 +167,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(false),
             new global::TUnit.Core.ArgumentsAttribute(true),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Type__Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -193,7 +186,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntegerArray__int__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -213,7 +205,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_IntMaxValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -233,7 +224,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(2147483647),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method__int_string, metadata_EnumValue__TestEnum, metadata_NullValue__string_, metadata_EmptyString__string_, metadata_NonEmptyString__string_, metadata_BooleanString__bool_, metadata_Type__Type, metadata_IntegerArray__int__, metadata_IntMaxValue__int };
@@ -632,7 +622,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2),
         new global::TUnit.Core.ArgumentsAttribute(3),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -677,7 +666,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
         new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -715,7 +703,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
         new global::TUnit.Core.ArgumentsAttribute(-1),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -751,7 +738,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -787,7 +773,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(""),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -823,7 +808,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -861,7 +845,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(false),
         new global::TUnit.Core.ArgumentsAttribute(true),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -897,7 +880,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -933,7 +915,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -969,7 +950,6 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(2147483647),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
index 296124df04..107eaab94c 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
@@ -121,7 +121,6 @@ internal static class TUnit_TestProject_DataSourceClassCombinedWithDataSourceMet
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSourceClassCombinedWithDataSourceMethodTest__int };
@@ -289,7 +288,6 @@ internal static class TUnit_TestProject_DataSourceClassCombinedWithDataSourceMet
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
index 44ba9a519a..a532187805 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
@@ -66,7 +66,6 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
             new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
             new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_GeneratedData_Method2__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
@@ -105,7 +104,6 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
             new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
             new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_GeneratedData_Method3__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
@@ -144,7 +142,6 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
             new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
             new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_GeneratedData_Method__int, metadata_GeneratedData_Method2__int_string_bool, metadata_GeneratedData_Method3__int_string_bool };
@@ -326,7 +323,6 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
         new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
         new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -404,7 +400,6 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
         new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
         new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -482,7 +477,6 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
         new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
         new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
index 201840aae8..28368a4c6c 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
@@ -59,7 +59,6 @@ internal static class TUnit_TestProject_AutoDataTests__TestSource
         {
             new global::TUnit.TestProject.Attributes.AutoDataAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1__string_int_double_bool };
@@ -160,7 +159,6 @@ internal static class TUnit_TestProject_AutoDataTests__TestSource
     {
         new global::TUnit.TestProject.Attributes.AutoDataAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
index 0df804ef29..d29e4ffe3c 100644
--- a/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
@@ -47,7 +47,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999m),
             new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999.00000000000000001m),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_SimpleDecimal__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -67,7 +66,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(123.456m),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_SmallDecimal__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -87,7 +85,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(0.00000000000000001m),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MaxDecimal__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -107,7 +104,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("79228162514264337593543950335"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MinDecimal__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -127,7 +123,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("-79228162514264337593543950335"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ExplicitDecimalValue__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -147,7 +142,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("123.456"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MultipleDecimals__decimal_decimal_decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -181,7 +175,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1.1m, 2.2m, 3.3m),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -203,7 +196,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(0.75m),
             new global::TUnit.Core.ArgumentsAttribute(1m),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -260,7 +252,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 5m, true),
             new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 0m, false),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Equality3__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -280,7 +271,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Equality4__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -300,7 +290,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(123_999.00000000000000001m),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_TestMethod__decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -320,7 +309,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(42),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Transfer__decimal_decimal, metadata_SimpleDecimal__decimal, metadata_SmallDecimal__decimal, metadata_MaxDecimal__decimal, metadata_MinDecimal__decimal, metadata_ExplicitDecimalValue__decimal, metadata_MultipleDecimals__decimal_decimal_decimal, metadata_Test__decimal, metadata_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool, metadata_Equality3__decimal, metadata_Equality4__decimal, metadata_TestMethod__decimal };
@@ -786,7 +774,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999m),
         new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m, 123_999.00000000000000001m),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -822,7 +809,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(123.456m),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -858,7 +844,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(0.00000000000000001m),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -894,7 +879,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("79228162514264337593543950335"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -930,7 +914,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("-79228162514264337593543950335"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -966,7 +949,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("123.456"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1016,7 +998,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1.1m, 2.2m, 3.3m),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1054,7 +1035,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(0.75m),
         new global::TUnit.Core.ArgumentsAttribute(1m),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1127,7 +1107,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 5m, true),
         new global::TUnit.Core.ArgumentsAttribute(70m, 75m, 70m, 5m, 0m, false),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1163,7 +1142,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(2_000.00000000000000001m),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1199,7 +1177,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(123_999.00000000000000001m),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1235,7 +1212,6 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(42),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
index f0e587b614..4ea5f35ed0 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
index edbb68244a..042b626d69 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
@@ -25,21 +25,18 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ValueTaskAsynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SynchronousTest, metadata_AsynchronousTest, metadata_ValueTaskAsynchronousTest };
@@ -151,7 +148,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "SynchronousTest", "SynchronousTest", 5,
             __InvokeTest_SynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SynchronousTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -174,7 +170,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "AsynchronousTest", "AsynchronousTest", 11,
             __InvokeTest_AsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("AsynchronousTest", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -197,7 +192,6 @@ internal static class TUnit_TestProject_BasicTests__TestSource
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
             __InvokeTest_ValueTaskAsynchronousTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("ValueTaskAsynchronousTest", __classType, typeof(global::System.Threading.Tasks.ValueTask), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
index 9e7dda5e3f..780df1bf5c 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
@@ -40,7 +40,6 @@ internal static class TUnit_TestProject_Bugs__1432_EnumMemberNamesTests__TestSou
             new global::TUnit.Core.ArgumentsAttribute("B"),
             new global::TUnit.Core.ArgumentsAttribute("C"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SomeTest__string };
@@ -124,7 +123,6 @@ internal static class TUnit_TestProject_Bugs__1432_EnumMemberNamesTests__TestSou
         new global::TUnit.Core.ArgumentsAttribute("B"),
         new global::TUnit.Core.ArgumentsAttribute("C"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
index 0a49161fb9..e6cc8f9090 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
@@ -59,7 +59,6 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
@@ -100,7 +99,6 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
@@ -141,7 +139,6 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_WithBaseReturn__BaseValue };
@@ -312,7 +309,6 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -369,7 +365,6 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -426,7 +421,6 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
index 827c951cd0..f93c4cc669 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
@@ -95,7 +95,6 @@ internal static class TUnit_TestProject_EnumerableTupleDataSourceDrivenTests__Te
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
@@ -234,7 +233,6 @@ internal static class TUnit_TestProject_EnumerableTupleDataSourceDrivenTests__Te
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
index a029d15426..660c54ca59 100644
--- a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
@@ -57,7 +57,6 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute((ulong)0, typeof(ulong)),
             new global::TUnit.Core.ArgumentsAttribute(0UL, typeof(ulong)),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumTypes__object_Type_Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
@@ -98,7 +97,6 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int64Enum.Default, typeof(global::TUnit.TestProject.Int64Enum), typeof(long)),
             new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt64Enum.Default, typeof(global::TUnit.TestProject.UInt64Enum), typeof(ulong)),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_TypedArguments__object_Type, metadata_EnumTypes__object_Type_Type };
@@ -232,7 +230,6 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute((ulong)0, typeof(ulong)),
         new global::TUnit.Core.ArgumentsAttribute(0UL, typeof(ulong)),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -289,7 +286,6 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int64Enum.Default, typeof(global::TUnit.TestProject.Int64Enum), typeof(long)),
         new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt64Enum.Default, typeof(global::TUnit.TestProject.UInt64Enum), typeof(ulong)),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/GenericMethodWithDataSourceTests.Generic_Method_With_MethodDataSource_Should_Generate_Tests.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericMethodWithDataSourceTests.Generic_Method_With_MethodDataSource_Should_Generate_Tests.verified.txt
index 4de6f2be85..ff43918ccd 100644
--- a/TUnit.Core.SourceGenerator.Tests/GenericMethodWithDataSourceTests.Generic_Method_With_MethodDataSource_Should_Generate_Tests.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/GenericMethodWithDataSourceTests.Generic_Method_With_MethodDataSource_Should_Generate_Tests.verified.txt
@@ -1,4 +1,4 @@
-// <auto-generated/>
+// <auto-generated/>
 #pragma warning disable
 
 #nullable enable
@@ -2176,32 +2176,32 @@ internal sealed class TUnit_TestProject_Bugs__4431_GenericClassWithClassDataSour
             ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
             PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
             PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "DataSource",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
+        Setter = (instance, value) =>
+        {
+            var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<>).GetField("<DataSource>k__BackingField",
+                global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
+            if (backingField != null)
             {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "DataSource",
-                    PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
-                    Setter = (instance, value) =>
-                    {
-                        var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<>).GetField("<DataSource>k__BackingField",
-                            global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                        if (backingField != null)
-                        {
-                            backingField.SetValue(instance, value);
-                        }
-                        else
-                        {
-                            throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<>");
-                        }
-                    },
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
+                backingField.SetValue(instance, value);
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<>");
+            }
+        },
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
             InheritanceDepth = 0,
             FilePath = @"",
             LineNumber = 210,
@@ -2269,32 +2269,32 @@ internal sealed class TUnit_TestProject_Bugs__4431_GenericClassWithClassDataSour
                     ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
                     PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
                     PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-                    {
-                        new global::TUnit.Core.PropertyInjectionData
-                        {
-                            PropertyName = "DataSource",
-                            PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
-                            Setter = (instance, value) =>
-                            {
-                                var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<global::TUnit.TestProject.Bugs._4431.TypeA>).GetField("<DataSource>k__BackingField",
-                                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                                if (backingField != null)
-                                {
-                                    backingField.SetValue(instance, value);
-                                }
-                                else
-                                {
-                                    throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<global::TUnit.TestProject.Bugs._4431.TypeA>");
-                                }
-                            },
-                            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                            NestedPropertyValueFactory = obj =>
-                            {
-                                return new global::System.Collections.Generic.Dictionary<string, object?>();
-                            }
-                        },
-                    },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "DataSource",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
+        Setter = (instance, value) =>
+        {
+            var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<global::TUnit.TestProject.Bugs._4431.TypeA>).GetField("<DataSource>k__BackingField",
+                global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
+            if (backingField != null)
+            {
+                backingField.SetValue(instance, value);
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<global::TUnit.TestProject.Bugs._4431.TypeA>");
+            }
+        },
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
                     FilePath = @"",
                     LineNumber = 210,
                     InheritanceDepth = 0,
@@ -2369,32 +2369,32 @@ internal sealed class TUnit_TestProject_Bugs__4431_GenericClassWithClassDataSour
                     ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
                     PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
                     PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-                    {
-                        new global::TUnit.Core.PropertyInjectionData
-                        {
-                            PropertyName = "DataSource",
-                            PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
-                            Setter = (instance, value) =>
-                            {
-                                var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<global::TUnit.TestProject.Bugs._4431.TypeB>).GetField("<DataSource>k__BackingField",
-                                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                                if (backingField != null)
-                                {
-                                    backingField.SetValue(instance, value);
-                                }
-                                else
-                                {
-                                    throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<global::TUnit.TestProject.Bugs._4431.TypeB>");
-                                }
-                            },
-                            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                            NestedPropertyValueFactory = obj =>
-                            {
-                                return new global::System.Collections.Generic.Dictionary<string, object?>();
-                            }
-                        },
-                    },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "DataSource",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
+        Setter = (instance, value) =>
+        {
+            var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<global::TUnit.TestProject.Bugs._4431.TypeB>).GetField("<DataSource>k__BackingField",
+                global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
+            if (backingField != null)
+            {
+                backingField.SetValue(instance, value);
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassWithClassDataSource<global::TUnit.TestProject.Bugs._4431.TypeB>");
+            }
+        },
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
                     FilePath = @"",
                     LineNumber = 210,
                     InheritanceDepth = 0,
@@ -2520,32 +2520,32 @@ internal sealed class TUnit_TestProject_Bugs__4431_GenericClassGenericMethodWith
             ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
             PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
             PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "DataSource",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
+        Setter = (instance, value) =>
+        {
+            var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<>).GetField("<DataSource>k__BackingField",
+                global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
+            if (backingField != null)
             {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "DataSource",
-                    PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
-                    Setter = (instance, value) =>
-                    {
-                        var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<>).GetField("<DataSource>k__BackingField",
-                            global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                        if (backingField != null)
-                        {
-                            backingField.SetValue(instance, value);
-                        }
-                        else
-                        {
-                            throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<>");
-                        }
-                    },
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
+                backingField.SetValue(instance, value);
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<>");
+            }
+        },
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
             InheritanceDepth = 0,
             FilePath = @"",
             LineNumber = 236,
@@ -2650,32 +2650,32 @@ internal sealed class TUnit_TestProject_Bugs__4431_GenericClassGenericMethodWith
                     ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
                     PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
                     PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-                    {
-                        new global::TUnit.Core.PropertyInjectionData
-                        {
-                            PropertyName = "DataSource",
-                            PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
-                            Setter = (instance, value) =>
-                            {
-                                var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeA>).GetField("<DataSource>k__BackingField",
-                                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                                if (backingField != null)
-                                {
-                                    backingField.SetValue(instance, value);
-                                }
-                                else
-                                {
-                                    throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeA>");
-                                }
-                            },
-                            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                            NestedPropertyValueFactory = obj =>
-                            {
-                                return new global::System.Collections.Generic.Dictionary<string, object?>();
-                            }
-                        },
-                    },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "DataSource",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
+        Setter = (instance, value) =>
+        {
+            var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeA>).GetField("<DataSource>k__BackingField",
+                global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
+            if (backingField != null)
+            {
+                backingField.SetValue(instance, value);
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeA>");
+            }
+        },
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
                     FilePath = @"",
                     LineNumber = 236,
                     InheritanceDepth = 0,
@@ -2787,32 +2787,32 @@ internal sealed class TUnit_TestProject_Bugs__4431_GenericClassGenericMethodWith
                     ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
                     PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
                     PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-                    {
-                        new global::TUnit.Core.PropertyInjectionData
-                        {
-                            PropertyName = "DataSource",
-                            PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
-                            Setter = (instance, value) =>
-                            {
-                                var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeA>).GetField("<DataSource>k__BackingField",
-                                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                                if (backingField != null)
-                                {
-                                    backingField.SetValue(instance, value);
-                                }
-                                else
-                                {
-                                    throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeA>");
-                                }
-                            },
-                            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                            NestedPropertyValueFactory = obj =>
-                            {
-                                return new global::System.Collections.Generic.Dictionary<string, object?>();
-                            }
-                        },
-                    },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "DataSource",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
+        Setter = (instance, value) =>
+        {
+            var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeA>).GetField("<DataSource>k__BackingField",
+                global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
+            if (backingField != null)
+            {
+                backingField.SetValue(instance, value);
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeA>");
+            }
+        },
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
                     FilePath = @"",
                     LineNumber = 236,
                     InheritanceDepth = 0,
@@ -2924,32 +2924,32 @@ internal sealed class TUnit_TestProject_Bugs__4431_GenericClassGenericMethodWith
                     ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
                     PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
                     PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-                    {
-                        new global::TUnit.Core.PropertyInjectionData
-                        {
-                            PropertyName = "DataSource",
-                            PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
-                            Setter = (instance, value) =>
-                            {
-                                var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeB>).GetField("<DataSource>k__BackingField",
-                                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                                if (backingField != null)
-                                {
-                                    backingField.SetValue(instance, value);
-                                }
-                                else
-                                {
-                                    throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeB>");
-                                }
-                            },
-                            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                            NestedPropertyValueFactory = obj =>
-                            {
-                                return new global::System.Collections.Generic.Dictionary<string, object?>();
-                            }
-                        },
-                    },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "DataSource",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
+        Setter = (instance, value) =>
+        {
+            var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeB>).GetField("<DataSource>k__BackingField",
+                global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
+            if (backingField != null)
+            {
+                backingField.SetValue(instance, value);
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeB>");
+            }
+        },
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
                     FilePath = @"",
                     LineNumber = 236,
                     InheritanceDepth = 0,
@@ -3061,32 +3061,32 @@ internal sealed class TUnit_TestProject_Bugs__4431_GenericClassGenericMethodWith
                     ClassDataSources = global::System.Array.Empty<global::TUnit.Core.IDataSourceAttribute>(),
                     PropertyDataSources = global::System.Array.Empty<global::TUnit.Core.PropertyDataSource>(),
                     PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-                    {
-                        new global::TUnit.Core.PropertyInjectionData
-                        {
-                            PropertyName = "DataSource",
-                            PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
-                            Setter = (instance, value) =>
-                            {
-                                var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeB>).GetField("<DataSource>k__BackingField",
-                                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                                if (backingField != null)
-                                {
-                                    backingField.SetValue(instance, value);
-                                }
-                                else
-                                {
-                                    throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeB>");
-                                }
-                            },
-                            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                            NestedPropertyValueFactory = obj =>
-                            {
-                                return new global::System.Collections.Generic.Dictionary<string, object?>();
-                            }
-                        },
-                    },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "DataSource",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._4431.TestDataSource),
+        Setter = (instance, value) =>
+        {
+            var backingField = typeof(global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeB>).GetField("<DataSource>k__BackingField",
+                global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
+            if (backingField != null)
+            {
+                backingField.SetValue(instance, value);
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("Could not find backing field for property DataSource on type global::TUnit.TestProject.Bugs._4431.GenericClassGenericMethodWithDataSources<global::TUnit.TestProject.Bugs._4431.TypeB>");
+            }
+        },
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
                     FilePath = @"",
                     LineNumber = 236,
                     InheritanceDepth = 0,
diff --git a/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
index a37a0a5b72..ab857558f3 100644
--- a/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_SimpleTestClass__TestSource
             "NonGenericTest", "NonGenericTest", 7,
             __InvokeTest_NonGenericTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("NonGenericTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_NonGenericTest };
@@ -85,7 +84,6 @@ internal static class TUnit_TestProject_SimpleTestClass__TestSource
             "NonGenericTest", "NonGenericTest", 7,
             __InvokeTest_NonGenericTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("NonGenericTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
index 1d21bd7ff4..ec0bd5654e 100644
--- a/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
@@ -39,7 +39,6 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
         {Shared = global::TUnit.Core.SharedType.None,},
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
@@ -115,7 +114,6 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
     {Shared = global::TUnit.Core.SharedType.None,},
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
index 267056f8f6..a6ab7acc29 100644
--- a/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
@@ -39,7 +39,6 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
         {Shared = global::TUnit.Core.SharedType.None,},
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
@@ -116,7 +115,6 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
     {Shared = global::TUnit.Core.SharedType.None,},
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
index 9102841487..aac08c7754 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
@@ -182,7 +182,105 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
                 DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
             },
         },
-            filePath: @"",
+            propertyInjections: new global::TUnit.Core.PropertyInjectionData[]
+        {
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property2",
+                PropertyType = typeof(string),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property3",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property4",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property5",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property6",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property7",
+                PropertyType = typeof(string),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+        },
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test };
@@ -386,7 +484,105 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
             DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
         },
     },
-            filePath: @"",
+            propertyInjections: new global::TUnit.Core.PropertyInjectionData[]
+    {
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property2",
+            PropertyType = typeof(string),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property3",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property4",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property5",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property6",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property7",
+            PropertyType = typeof(string),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+    },
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -491,104 +687,104 @@ internal sealed class TUnit_TestProject_InheritedPropertySetterTests_Test_TestSo
                 },
             },
             PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-            {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property2",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property3",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property4",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property5",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property6",
-                    PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Property7",
-                    PropertyType = typeof(string),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "Property2",
+        PropertyType = typeof(string),
+        #if NET8_0_OR_GREATER
+        Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+        #else
+        Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+        #endif
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "Property3",
+        PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        #if NET8_0_OR_GREATER
+        Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+        #else
+        Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+        #endif
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "Property4",
+        PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        #if NET8_0_OR_GREATER
+        Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+        #else
+        Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+        #endif
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "Property5",
+        PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        #if NET8_0_OR_GREATER
+        Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+        #else
+        Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+        #endif
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "Property6",
+        PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        #if NET8_0_OR_GREATER
+        Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+        #else
+        Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+        #endif
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "Property7",
+        PropertyType = typeof(string),
+        #if NET8_0_OR_GREATER
+        Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+        #else
+        Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+        #endif
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
             InheritanceDepth = 1,
             FilePath = @"",
             LineNumber = 3,
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
index a8d111430f..06890cad4c 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
             "Test", "Test", 9,
             __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_GenericMethodDataSource__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
@@ -45,7 +44,6 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
         {
             new global::TUnit.Core.MethodDataSourceAttribute<global::TUnit.TestProject.TestData>("Foo"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_NonGenericMethodDataSource__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
@@ -76,14 +74,12 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_VerifyInheritedCategoriesAreAvailable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
             "VerifyInheritedCategoriesAreAvailable", "VerifyInheritedCategoriesAreAvailable", 26,
             __InvokeTest_VerifyInheritedCategoriesAreAvailable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("VerifyInheritedCategoriesAreAvailable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test, metadata_GenericMethodDataSource__string, metadata_NonGenericMethodDataSource__string, metadata_VerifyInheritedCategoriesAreAvailable };
@@ -242,7 +238,6 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
             "Test", "Test", 9,
             __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -278,7 +273,6 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     {
         new global::TUnit.Core.MethodDataSourceAttribute<global::TUnit.TestProject.TestData>("Foo"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -325,7 +319,6 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -348,7 +341,6 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
             "VerifyInheritedCategoriesAreAvailable", "VerifyInheritedCategoriesAreAvailable", 26,
             __InvokeTest_VerifyInheritedCategoriesAreAvailable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("VerifyInheritedCategoriesAreAvailable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
index de8866edfc..3cd29a32aa 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
             "SecondTest", "SecondTest", 11,
             __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_SecondTest };
@@ -87,7 +86,6 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
             "SecondTest", "SecondTest", 11,
             __InvokeTest_SecondTest, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("SecondTest", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
index f267ed8a9e..ebb8e19fb2 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
@@ -65,9 +65,27 @@ internal static class TUnit_TestProject_Bugs__1924_None_BaseClass__TestSource
                 PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
                 DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1924.DataClass>(),
             },
+        },
+            propertyInjections: new global::TUnit.Core.PropertyInjectionData[]
+        {
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Data",
+                PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
         },
             repeatCount: 10,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test__int };
@@ -172,9 +190,27 @@ internal static class TUnit_TestProject_Bugs__1924_None_BaseClass__TestSource
             PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
             DataSource = new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1924.DataClass>(),
         },
+    },
+            propertyInjections: new global::TUnit.Core.PropertyInjectionData[]
+    {
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Data",
+            PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
     },
             repeatCount: 10,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -236,24 +272,24 @@ internal sealed class TUnit_TestProject_Bugs__1924_None_Tests_Test__int_TestSour
                 },
             },
             PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-            {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Data",
-                    PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "Data",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+        #if NET8_0_OR_GREATER
+        Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
+        #else
+        Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+        #endif
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
             InheritanceDepth = 1,
             FilePath = @"",
             LineNumber = 23,
@@ -400,24 +436,24 @@ internal sealed class TUnit_TestProject_Bugs__1924_None_Tests2_Test__int_TestSou
                 },
             },
             PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-            {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Data",
-                    PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "Data",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+        #if NET8_0_OR_GREATER
+        Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
+        #else
+        Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+        #endif
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
             InheritanceDepth = 1,
             FilePath = @"",
             LineNumber = 26,
@@ -564,24 +600,24 @@ internal sealed class TUnit_TestProject_Bugs__1924_None_Tests3_Test__int_TestSou
                 },
             },
             PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]
-            {
-                new global::TUnit.Core.PropertyInjectionData
-                {
-                    PropertyName = "Data",
-                    PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-                    #if NET8_0_OR_GREATER
-                    Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
-                    #else
-                    Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
-                    #endif
-                    ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
-                    NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
-                    NestedPropertyValueFactory = obj =>
-                    {
-                        return new global::System.Collections.Generic.Dictionary<string, object?>();
-                    }
-                },
-            },
+{
+    new global::TUnit.Core.PropertyInjectionData
+    {
+        PropertyName = "Data",
+        PropertyType = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+        #if NET8_0_OR_GREATER
+        Setter = (instance, value) => GetDataBackingField((global::TUnit.TestProject.Bugs._1924.None.BaseClass)instance) = (global::TUnit.TestProject.Bugs._1924.DataClass)value,
+        #else
+        Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+        #endif
+        ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+        NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+        NestedPropertyValueFactory = obj =>
+        {
+            return new global::System.Collections.Generic.Dictionary<string, object?>();
+        }
+    },
+},
             InheritanceDepth = 1,
             FilePath = @"",
             LineNumber = 29,
diff --git a/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
index 60f5ba6fd7..db37bb1804 100644
--- a/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
@@ -34,7 +34,6 @@ internal static class TUnit_TestProject_Bugs__Issue2887_ActualTestClass__TestSou
             "Test1", "Test1", 26,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
@@ -104,7 +103,6 @@ internal static class TUnit_TestProject_Bugs__Issue2887_ActualTestClass__TestSou
             "Test1", "Test1", 26,
             __InvokeTest_Test1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test1", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
index bdc964e673..6d35698b06 100644
--- a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
@@ -52,7 +52,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Two__int_int_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -93,7 +92,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest_Enum__int_TestEnum_TestEnum_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -127,7 +125,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools__string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -154,7 +151,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_AutoGenerateBools2__string_bool_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -181,7 +177,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -208,7 +203,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -235,7 +229,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method1__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -255,7 +248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -275,7 +267,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -295,7 +286,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -315,7 +305,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Exclusion__int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -342,7 +331,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -369,7 +357,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_MatrixTest_One__string_int_bool, metadata_MatrixTest_Two__int_int_int_bool, metadata_MatrixTest_Enum__int_TestEnum_TestEnum_, metadata_AutoGenerateBools__string_bool, metadata_AutoGenerateBools2__string_bool_, metadata_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool, metadata_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool, metadata_Method1__int, metadata_Method2__int, metadata_Method3__int, metadata_Method4__int, metadata_Exclusion__int_int, metadata_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum };
@@ -883,7 +870,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -940,7 +926,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -990,7 +975,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1033,7 +1017,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1076,7 +1059,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1119,7 +1101,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1162,7 +1143,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1198,7 +1178,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1234,7 +1213,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1270,7 +1248,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1306,7 +1283,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1349,7 +1325,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1392,7 +1367,6 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
index 4a0380760c..1d0c7189e2 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
@@ -49,7 +49,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method2__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -80,7 +79,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method_WithAction__Action = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -111,7 +109,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method3__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -157,7 +154,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_Method4__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -230,7 +226,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSource_WithBaseReturn__BaseValue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -261,7 +256,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_EnumerableFuncArrayTest__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -302,7 +296,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_Method__int, metadata_DataSource_Method2__int, metadata_DataSource_Method_WithAction__Action, metadata_DataSource_Method3__int, metadata_DataSource_Method4__int, metadata_DataSource_WithBaseReturn__BaseValue, metadata_EnumerableFuncArrayTest__string__ };
@@ -604,7 +597,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -651,7 +643,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -698,7 +689,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -760,7 +750,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -849,7 +838,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -896,7 +884,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -953,7 +940,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
index 797f24e33c..4f246f9d90 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
@@ -156,7 +156,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenWithCancellationTo
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_MyTest__int_CancellationToken };
@@ -358,7 +357,6 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenWithCancellationTo
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
index cb927310fd..c7f882fc74 100644
--- a/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
@@ -67,7 +67,6 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
         {Shared = new global::TUnit.Core.SharedType[]{global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None},},
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
@@ -79,7 +78,6 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
         {Shared = new global::TUnit.Core.SharedType[]{global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None},},
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1, metadata_Test2 };
@@ -211,7 +209,6 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
     {Shared = new global::TUnit.Core.SharedType[]{global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None},},
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -276,7 +273,6 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4, global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5>()
     {Shared = new global::TUnit.Core.SharedType[]{global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None,global::TUnit.Core.SharedType.None},},
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
index cc8e648196..46e1d4c8ac 100644
--- a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_NameOfArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute("TestName"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestName__string };
@@ -119,7 +118,6 @@ internal static class TUnit_TestProject_NameOfArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute("TestName"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
index b16c20e099..a311148895 100644
--- a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
@@ -39,7 +39,6 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute((byte) 1),
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test2__byte_byte_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
@@ -67,7 +66,6 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute((byte) 1, (byte) 1),
             new global::TUnit.Core.ArgumentsAttribute((byte) 1, null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test__byte_, metadata_Test2__byte_byte_ };
@@ -185,7 +183,6 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute((byte) 1),
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -229,7 +226,6 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute((byte) 1, (byte) 1),
         new global::TUnit.Core.ArgumentsAttribute((byte) 1, null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
index edbe8c4f29..cc2991941f 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Double__double = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -58,7 +57,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1.1),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Float__float = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -78,7 +76,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1.1f),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Long__long = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -98,7 +95,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1L),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ULong__ulong = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -118,7 +114,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1UL),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_UInt__uint = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -138,7 +133,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1U),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Int__int, metadata_Double__double, metadata_Float__float, metadata_Long__long, metadata_ULong__ulong, metadata_UInt__uint };
@@ -395,7 +389,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -431,7 +424,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1.1),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -467,7 +459,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1.1f),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -503,7 +494,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1L),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -539,7 +529,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1UL),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -575,7 +564,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1U),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
index edbe8c4f29..cc2991941f 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Double__double = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -58,7 +57,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1.1),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Float__float = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -78,7 +76,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1.1f),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Long__long = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -98,7 +95,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1L),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_ULong__ulong = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -118,7 +114,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1UL),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_UInt__uint = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -138,7 +133,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(1U),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Int__int, metadata_Double__double, metadata_Float__float, metadata_Long__long, metadata_ULong__ulong, metadata_UInt__uint };
@@ -395,7 +389,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -431,7 +424,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1.1),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -467,7 +459,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1.1f),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -503,7 +494,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1L),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -539,7 +529,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1UL),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -575,7 +564,6 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(1U),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
index bbb2940887..7c77ba05a5 100644
--- a/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
@@ -25,42 +25,36 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
             "High_1", "High_1", 12,
             __InvokeTest_High_1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("High_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_High_2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "High_2", "High_2", 18,
             __InvokeTest_High_2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("High_2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_High_3 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "High_3", "High_3", 24,
             __InvokeTest_High_3, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("High_3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Medium_1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "Medium_1", "Medium_1", 30,
             __InvokeTest_Medium_1, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Medium_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Medium_2 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "Medium_2", "Medium_2", 36,
             __InvokeTest_Medium_2, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Medium_2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Low_1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "Low_1", "Low_1", 42,
             __InvokeTest_Low_1, __CreateAttributes_2, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Low_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_High_1, metadata_High_2, metadata_High_3, metadata_Medium_1, metadata_Medium_2, metadata_Low_1 };
@@ -266,7 +260,6 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
             "High_1", "High_1", 12,
             __InvokeTest_High_1, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("High_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -289,7 +282,6 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
             "High_2", "High_2", 18,
             __InvokeTest_High_2, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("High_2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -312,7 +304,6 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
             "High_3", "High_3", 24,
             __InvokeTest_High_3, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("High_3", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -335,7 +326,6 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
             "Medium_1", "Medium_1", 30,
             __InvokeTest_Medium_1, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Medium_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -358,7 +348,6 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
             "Medium_2", "Medium_2", 36,
             __InvokeTest_Medium_2, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Medium_2", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -381,7 +370,6 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
             "Low_1", "Low_1", 42,
             __InvokeTest_Low_1, __CreateAttributes_2, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Low_1", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
index 0a196505af..e36e7a4543 100644
--- a/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
@@ -182,7 +182,105 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
                 DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
             },
         },
-            filePath: @"",
+            propertyInjections: new global::TUnit.Core.PropertyInjectionData[]
+        {
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property2",
+                PropertyType = typeof(string),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property3",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property4",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property5",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property6",
+                PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+            new global::TUnit.Core.PropertyInjectionData
+            {
+                PropertyName = "Property7",
+                PropertyType = typeof(string),
+                #if NET8_0_OR_GREATER
+                Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+                #else
+                Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+                #endif
+                ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+                NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+                NestedPropertyValueFactory = obj =>
+                {
+                    return new global::System.Collections.Generic.Dictionary<string, object?>();
+                }
+            },
+        },
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test };
@@ -386,7 +484,105 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
             DataSource = new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<string>(),
         },
     },
-            filePath: @"",
+            propertyInjections: new global::TUnit.Core.PropertyInjectionData[]
+    {
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property2",
+            PropertyType = typeof(string),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty2BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property3",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty3BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property4",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty4BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property5",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty5BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property6",
+            PropertyType = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty6BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (global::TUnit.TestProject.PropertySetterTests.InnerModel)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+        new global::TUnit.Core.PropertyInjectionData
+        {
+            PropertyName = "Property7",
+            PropertyType = typeof(string),
+            #if NET8_0_OR_GREATER
+            Setter = (instance, value) => GetProperty7BackingField((global::TUnit.TestProject.PropertySetterTests)instance) = (string)value,
+            #else
+            Setter = (instance, value) => throw new global::System.NotSupportedException("Setting init-only properties requires .NET 8 or later"),
+            #endif
+            ValueFactory = () => throw new global::System.InvalidOperationException("ValueFactory should be provided by TestDataCombination"),
+            NestedPropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),
+            NestedPropertyValueFactory = obj =>
+            {
+                return new global::System.Collections.Generic.Dictionary<string, object?>();
+            }
+        },
+    },
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
index 436b686e22..fdcbccc2ff 100644
--- a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
@@ -26,7 +26,6 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
             __InvokeTest_TestWithAssemblyRepeat, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithAssemblyRepeat", __classType, typeof(void), __classMetadata),
             repeatCount: 3,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_TestWithMethodRepeatOverride = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
@@ -34,7 +33,6 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
             __InvokeTest_TestWithMethodRepeatOverride, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithMethodRepeatOverride", __classType, typeof(void), __classMetadata),
             repeatCount: 1,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithAssemblyRepeat, metadata_TestWithMethodRepeatOverride };
@@ -132,7 +130,6 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
             __InvokeTest_TestWithAssemblyRepeat, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithAssemblyRepeat", __classType, typeof(void), __classMetadata),
             repeatCount: 3,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -156,7 +153,6 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
             __InvokeTest_TestWithMethodRepeatOverride, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithMethodRepeatOverride", __classType, typeof(void), __classMetadata),
             repeatCount: 1,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
index aae9f90ed9..b51529b36e 100644
--- a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
@@ -26,7 +26,6 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
             __InvokeTest_One, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("One", __classType, typeof(void), __classMetadata),
             repeatCount: 1,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Two = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
@@ -34,7 +33,6 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
             __InvokeTest_Two, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Two", __classType, typeof(void), __classMetadata),
             repeatCount: 2,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Three = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
@@ -42,7 +40,6 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
             __InvokeTest_Three, __CreateAttributes_2, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Three", __classType, typeof(void), __classMetadata),
             repeatCount: 3,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_One, metadata_Two, metadata_Three };
@@ -179,7 +176,6 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
             __InvokeTest_One, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("One", __classType, typeof(void), __classMetadata),
             repeatCount: 1,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -203,7 +199,6 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
             __InvokeTest_Two, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Two", __classType, typeof(void), __classMetadata),
             repeatCount: 2,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -227,7 +222,6 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
             __InvokeTest_Three, __CreateAttributes_2, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Three", __classType, typeof(void), __classMetadata),
             repeatCount: 3,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
index 992fcd29de..7c88630198 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
@@ -26,7 +26,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Without_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -34,7 +33,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithSimpleAwait = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -42,7 +40,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskYield = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -50,7 +47,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithConfigureAwaitTrue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -58,7 +54,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithNestedAsyncCalls = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -66,7 +61,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskFromResult = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -74,7 +68,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithCompletedTask = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -82,7 +75,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskRun = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -90,7 +82,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithMultipleAwaits = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -98,7 +89,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithAsyncEnumerable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -106,7 +96,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskWhenAll = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -114,7 +103,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithExceptionHandling = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -122,7 +110,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithThrowsNothingAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -130,7 +117,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithFuncAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -138,7 +124,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_With_STA, metadata_Without_STA, metadata_STA_WithSimpleAwait, metadata_STA_WithTaskYield, metadata_STA_WithConfigureAwaitTrue, metadata_STA_WithNestedAsyncCalls, metadata_STA_WithTaskFromResult, metadata_STA_WithCompletedTask, metadata_STA_WithTaskRun, metadata_STA_WithMultipleAwaits, metadata_STA_WithAsyncEnumerable, metadata_STA_WithTaskWhenAll, metadata_STA_WithExceptionHandling, metadata_STA_WithThrowsNothingAssertion, metadata_STA_WithFuncAssertion };
@@ -578,7 +563,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -602,7 +586,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -626,7 +609,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -650,7 +632,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -674,7 +655,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -698,7 +678,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -722,7 +701,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -746,7 +724,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -770,7 +747,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -794,7 +770,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -818,7 +793,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -842,7 +816,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -866,7 +839,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -890,7 +862,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -914,7 +885,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
index 992fcd29de..7c88630198 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
@@ -26,7 +26,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Without_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -34,7 +33,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithSimpleAwait = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -42,7 +40,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskYield = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -50,7 +47,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithConfigureAwaitTrue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -58,7 +54,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithNestedAsyncCalls = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -66,7 +61,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskFromResult = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -74,7 +68,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithCompletedTask = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -82,7 +75,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskRun = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -90,7 +82,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithMultipleAwaits = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -98,7 +89,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithAsyncEnumerable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -106,7 +96,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskWhenAll = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -114,7 +103,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithExceptionHandling = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -122,7 +110,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithThrowsNothingAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -130,7 +117,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithFuncAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -138,7 +124,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_With_STA, metadata_Without_STA, metadata_STA_WithSimpleAwait, metadata_STA_WithTaskYield, metadata_STA_WithConfigureAwaitTrue, metadata_STA_WithNestedAsyncCalls, metadata_STA_WithTaskFromResult, metadata_STA_WithCompletedTask, metadata_STA_WithTaskRun, metadata_STA_WithMultipleAwaits, metadata_STA_WithAsyncEnumerable, metadata_STA_WithTaskWhenAll, metadata_STA_WithExceptionHandling, metadata_STA_WithThrowsNothingAssertion, metadata_STA_WithFuncAssertion };
@@ -578,7 +563,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -602,7 +586,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -626,7 +609,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -650,7 +632,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -674,7 +655,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -698,7 +678,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -722,7 +701,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -746,7 +724,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -770,7 +747,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -794,7 +770,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -818,7 +793,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -842,7 +816,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -866,7 +839,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -890,7 +862,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -914,7 +885,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
index 992fcd29de..7c88630198 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
@@ -26,7 +26,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Without_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -34,7 +33,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithSimpleAwait = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -42,7 +40,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskYield = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -50,7 +47,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithConfigureAwaitTrue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -58,7 +54,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithNestedAsyncCalls = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -66,7 +61,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskFromResult = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -74,7 +68,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithCompletedTask = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -82,7 +75,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskRun = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -90,7 +82,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithMultipleAwaits = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -98,7 +89,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithAsyncEnumerable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -106,7 +96,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskWhenAll = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -114,7 +103,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithExceptionHandling = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -122,7 +110,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithThrowsNothingAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -130,7 +117,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithFuncAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -138,7 +124,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_With_STA, metadata_Without_STA, metadata_STA_WithSimpleAwait, metadata_STA_WithTaskYield, metadata_STA_WithConfigureAwaitTrue, metadata_STA_WithNestedAsyncCalls, metadata_STA_WithTaskFromResult, metadata_STA_WithCompletedTask, metadata_STA_WithTaskRun, metadata_STA_WithMultipleAwaits, metadata_STA_WithAsyncEnumerable, metadata_STA_WithTaskWhenAll, metadata_STA_WithExceptionHandling, metadata_STA_WithThrowsNothingAssertion, metadata_STA_WithFuncAssertion };
@@ -578,7 +563,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -602,7 +586,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -626,7 +609,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -650,7 +632,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -674,7 +655,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -698,7 +678,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -722,7 +701,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -746,7 +724,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -770,7 +747,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -794,7 +770,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -818,7 +793,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -842,7 +816,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -866,7 +839,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -890,7 +862,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -914,7 +885,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
index 80d3839a7b..a6eface3dd 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
@@ -26,7 +26,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Without_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -34,7 +33,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithSimpleAwait = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -42,7 +40,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskYield = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -50,7 +47,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithConfigureAwaitTrue = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -58,7 +54,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithNestedAsyncCalls = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -66,7 +61,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskFromResult = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -74,7 +68,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithCompletedTask = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -82,7 +75,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskRun = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -90,7 +82,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithMultipleAwaits = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -98,7 +89,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithAsyncEnumerable = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -106,7 +96,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithTaskWhenAll = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -114,7 +103,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithExceptionHandling = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -122,7 +110,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithThrowsNothingAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -130,7 +117,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_STA_WithFuncAssertion = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -138,7 +124,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_With_STA, metadata_Without_STA, metadata_STA_WithSimpleAwait, metadata_STA_WithTaskYield, metadata_STA_WithConfigureAwaitTrue, metadata_STA_WithNestedAsyncCalls, metadata_STA_WithTaskFromResult, metadata_STA_WithCompletedTask, metadata_STA_WithTaskRun, metadata_STA_WithMultipleAwaits, metadata_STA_WithAsyncEnumerable, metadata_STA_WithTaskWhenAll, metadata_STA_WithExceptionHandling, metadata_STA_WithThrowsNothingAssertion, metadata_STA_WithFuncAssertion };
@@ -578,7 +563,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_With_STA, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("With_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -602,7 +586,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_Without_STA, __CreateAttributes_1, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Without_STA", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -626,7 +609,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithSimpleAwait, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithSimpleAwait", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -650,7 +632,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskYield, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskYield", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -674,7 +655,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithConfigureAwaitTrue, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithConfigureAwaitTrue", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -698,7 +678,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithNestedAsyncCalls, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithNestedAsyncCalls", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -722,7 +701,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskFromResult, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskFromResult", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -746,7 +724,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithCompletedTask, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithCompletedTask", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -770,7 +747,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskRun, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskRun", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -794,7 +770,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithMultipleAwaits, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithMultipleAwaits", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -818,7 +793,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithAsyncEnumerable, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithAsyncEnumerable", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -842,7 +816,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithTaskWhenAll, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithTaskWhenAll", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -866,7 +839,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithExceptionHandling, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithExceptionHandling", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -890,7 +862,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithThrowsNothingAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithThrowsNothingAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -914,7 +885,6 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
             __InvokeTest_STA_WithFuncAssertion, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("STA_WithFuncAssertion", __classType, typeof(global::System.Threading.Tasks.Task), __classMetadata),
             repeatCount: 100,
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
index 0bae132c66..3f535f36e7 100644
--- a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
@@ -49,7 +49,6 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
                 """
         ),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Nullable__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
@@ -76,7 +75,6 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
             new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Normal__string, metadata_Nullable__string_ };
@@ -204,7 +202,6 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
             """
     ),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -247,7 +244,6 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
         new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
index 2f324bcff5..7594489942 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
@@ -49,7 +49,6 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(" "),
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Parse_InvalidString_ThrowsException__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
@@ -73,7 +72,6 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(" "),
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_TryParse_ValidString_ReturnsAccountId__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
@@ -94,7 +92,6 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
             new global::TUnit.Core.ArgumentsAttribute("2c48c152-7cb7-4f51-8f01-704454f36e60"),
             new global::TUnit.Core.ArgumentsAttribute("00000000-0000-0000-0000-000000000000"),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_TryParse_InvalidString_ReturnsFailure__string__CancellationToken, metadata_Parse_InvalidString_ThrowsException__string_, metadata_TryParse_ValidString_ReturnsAccountId__string };
@@ -255,7 +252,6 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(" "),
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -295,7 +291,6 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(" "),
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -332,7 +327,6 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
         new global::TUnit.Core.ArgumentsAttribute("2c48c152-7cb7-4f51-8f01-704454f36e60"),
         new global::TUnit.Core.ArgumentsAttribute("00000000-0000-0000-0000-000000000000"),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
index e97983f09a..5cb193a9ba 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
@@ -108,7 +108,6 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
@@ -254,7 +253,6 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Eight_Args__bool_string__string__string__string__string__string__string_, metadata_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_ };
@@ -441,7 +439,6 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -603,7 +600,6 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
index 40e9248792..4b00305516 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_Bugs__1539_Tests__TestSource
             "Test", "Test", 8,
             __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test };
@@ -90,7 +89,6 @@ internal static class TUnit_TestProject_Bugs__1539_Tests__TestSource
             "Test", "Test", 8,
             __InvokeTest_Test, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("Test", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
index 1d21bd7ff4..ec0bd5654e 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
@@ -39,7 +39,6 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
         {Shared = global::TUnit.Core.SharedType.None,},
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
@@ -115,7 +114,6 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1589.MyFixture>()
     {Shared = global::TUnit.Core.SharedType.None,},
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
index 267056f8f6..a6ab7acc29 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
@@ -39,7 +39,6 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
         {Shared = global::TUnit.Core.SharedType.None,},
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test1 };
@@ -116,7 +115,6 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1594.MyFixture>()
     {Shared = global::TUnit.Core.SharedType.None,},
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
index 68975d075d..5da5001162 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute((short) -123),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Integer_To_Short_Converts__short = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
@@ -58,7 +57,6 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
         {
             new global::TUnit.Core.ArgumentsAttribute(-123),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Casted_Integer_To_Short_Converts__short, metadata_Integer_To_Short_Converts__short };
@@ -173,7 +171,6 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute((short) -123),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -209,7 +206,6 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
     {
         new global::TUnit.Core.ArgumentsAttribute(-123),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
index 654a8abc5a..e7a262fbe9 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
@@ -39,7 +39,6 @@ internal static class TUnit_TestProject_Bugs__1692_Tests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(null),
             new global::TUnit.Core.ArgumentsAttribute(null),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_NullTest__string_ };
@@ -121,7 +120,6 @@ internal static class TUnit_TestProject_Bugs__1692_Tests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(null),
         new global::TUnit.Core.ArgumentsAttribute(null),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
index 8c125550ae..62957460c9 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
@@ -51,7 +51,6 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
         {
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixDataSource__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
@@ -75,7 +74,6 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
         {
             new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_MethodDataSource__string, metadata_MatrixDataSource__string };
@@ -204,7 +202,6 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
     {
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -253,7 +250,6 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
     {
         new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
index 2bda907050..66b2271c4f 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
@@ -43,7 +43,6 @@ internal static class TUnit_TestProject_Bugs__2083_Tests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(2147483647),
             new global::TUnit.Core.ArgumentsAttribute(9223372036854775807L),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_MyTest__long };
@@ -130,7 +129,6 @@ internal static class TUnit_TestProject_Bugs__2083_Tests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(2147483647),
         new global::TUnit.Core.ArgumentsAttribute(9223372036854775807L),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
index 28f3006bdd..deac881ded 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
@@ -38,7 +38,6 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Float_SpecialConsts__float = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
@@ -58,7 +57,6 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
         {
             new global::TUnit.Core.MatrixDataSourceAttribute(),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Double_SpecialConsts__double, metadata_Float_SpecialConsts__float };
@@ -173,7 +171,6 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -209,7 +206,6 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
     {
         new global::TUnit.Core.MatrixDataSourceAttribute(),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
index eb382501d4..99dc0da007 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
@@ -46,7 +46,6 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(0, 1L),
             new global::TUnit.Core.ArgumentsAttribute(0, 1L),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_Test2__int_long__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
@@ -74,7 +73,6 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
             new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
             new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_Test__int_long__, metadata_Test2__int_long__ };
@@ -259,7 +257,6 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(0, 1L),
         new global::TUnit.Core.ArgumentsAttribute(0, 1L),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -303,7 +300,6 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
         new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
         new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
index 789ed48c0d..261a295c55 100644
--- a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
@@ -68,7 +68,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_BasicTest__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -109,7 +108,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_InheritedTimeoutAttribute__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -150,7 +148,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataTest__int_CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -202,7 +199,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_DataSourceTest__int_CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -275,7 +271,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         var metadata_MatrixTest__int_CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -327,7 +322,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DefaultTest__CancellationToken, metadata_BasicTest__CancellationToken, metadata_InheritedTimeoutAttribute__CancellationToken, metadata_DataTest__int_CancellationToken, metadata_DataSourceTest__int_CancellationToken, metadata_MatrixTest__int_CancellationToken };
@@ -646,7 +640,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -712,7 +705,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -778,7 +770,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -855,7 +846,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -953,7 +943,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1030,7 +1019,6 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1119,7 +1107,6 @@ internal static class TUnit_TestProject_TimeoutDoesNotFireTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_QuickTestDoesNotTimeout__CancellationToken };
@@ -1225,7 +1212,6 @@ internal static class TUnit_TestProject_TimeoutDoesNotFireTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
@@ -1314,7 +1300,6 @@ internal static class TUnit_TestProject_CancellationTokenTriggeredTests__TestSou
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_CancellationTokenIsTriggered__CancellationToken };
@@ -1420,7 +1405,6 @@ internal static class TUnit_TestProject_CancellationTokenTriggeredTests__TestSou
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
index a651380f8a..5cb3b0cf76 100644
--- a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
@@ -63,7 +63,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
                 }
             },
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_DataSource_TupleMethod__int_string_bool };
@@ -170,7 +169,6 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
             }
         },
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
index 39bb76d714..2a8665dbb3 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
@@ -53,7 +53,6 @@ internal static class TUnit_TestProject_AotDataSourceTest__TestSource
             new global::TUnit.Core.ArgumentsAttribute(1, 2, 3),
             new global::TUnit.Core.ArgumentsAttribute(4, 5, 6),
         },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithDataSource__int_int_int };
@@ -149,7 +148,6 @@ internal static class TUnit_TestProject_AotDataSourceTest__TestSource
         new global::TUnit.Core.ArgumentsAttribute(1, 2, 3),
         new global::TUnit.Core.ArgumentsAttribute(4, 5, 6),
     },
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
index c91bd4edc0..608d160749 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_ConfigurationTest__TestSource
             "TestWithConfiguration", "TestWithConfiguration", 7,
             __InvokeTest_TestWithConfiguration, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithConfiguration", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithConfiguration };
@@ -85,7 +84,6 @@ internal static class TUnit_TestProject_ConfigurationTest__TestSource
             "TestWithConfiguration", "TestWithConfiguration", 7,
             __InvokeTest_TestWithConfiguration, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithConfiguration", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
index 29ac37757e..5d97b8b8b8 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_ModuleInitializerTest__TestSource
             "TestWithModuleInit", "TestWithModuleInit", 8,
             __InvokeTest_TestWithModuleInit, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithModuleInit", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithModuleInit };
@@ -85,7 +84,6 @@ internal static class TUnit_TestProject_ModuleInitializerTest__TestSource
             "TestWithModuleInit", "TestWithModuleInit", 8,
             __InvokeTest_TestWithModuleInit, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithModuleInit", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
index acf704f19f..0de4655801 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
@@ -25,7 +25,6 @@ internal static class TUnit_TestProject_TypedDelegateTest__TestSource
             "TestWithDelegate", "TestWithDelegate", 7,
             __InvokeTest_TestWithDelegate, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithDelegate", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata_TestWithDelegate };
@@ -85,7 +84,6 @@ internal static class TUnit_TestProject_TypedDelegateTest__TestSource
             "TestWithDelegate", "TestWithDelegate", 7,
             __InvokeTest_TestWithDelegate, __CreateAttributes_0, CreateInstance,
             global::TUnit.Core.MethodMetadataFactory.Create("TestWithDelegate", __classType, typeof(void), __classMetadata),
-            filePath: @"",
             testSessionId: testSessionId
         );
         return new global::TUnit.Core.TestMetadata[] { metadata };
diff --git a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
index f7a36b4848..7328a60b27 100644
--- a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
+++ b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
@@ -1396,147 +1396,139 @@ private static void WriteTypedConstant(CodeWriter writer, TypedConstant constant
 
     private static void GeneratePropertyInjections(CodeWriter writer, INamedTypeSymbol typeSymbol, string className)
     {
-        // Walk inheritance hierarchy to find properties with data source attributes
+        var expr = GeneratePropertyInjectionsExpression(typeSymbol, className);
+        if (expr == null)
+        {
+            writer.AppendLine("PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),");
+        }
+        else
+        {
+            writer.AppendLine($"PropertyInjections = {expr},");
+        }
+    }
+
+    /// <summary>
+    /// Returns a PropertyInjectionData[] array expression, or null if no qualifying properties exist.
+    /// Single-pass: collects qualifying properties then generates the expression.
+    /// </summary>
+    private static string? GeneratePropertyInjectionsExpression(INamedTypeSymbol typeSymbol, string className)
+    {
+        // Single pass: collect qualifying properties with their containing type context
+        var qualifyingProperties = new List<(IPropertySymbol Property, INamedTypeSymbol ContainingType)>();
+        var processedNames = new HashSet<string>();
         var currentType = typeSymbol;
-        var processedProperties = new HashSet<string>();
-        var hasPropertyInjections = false;
 
-        // First check if we have any property injections
-        var tempType = currentType;
-        while (tempType != null)
+        while (currentType != null)
         {
-            foreach (var member in tempType.GetMembers())
+            foreach (var member in currentType.GetMembers())
             {
                 if (member is IPropertySymbol { DeclaredAccessibility: Accessibility.Public, SetMethod.DeclaredAccessibility: Accessibility.Public, IsStatic: false } property &&
-                    !processedProperties.Contains(property.Name))
+                    !processedNames.Contains(property.Name))
                 {
-                    var dataSourceAttr = property.GetAttributes()
-                        .FirstOrDefault(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass));
-
-                    if (dataSourceAttr != null)
+                    if (property.GetAttributes().Any(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass)))
                     {
-                        hasPropertyInjections = true;
-                        processedProperties.Add(property.Name);
+                        processedNames.Add(property.Name);
+                        // IMPORTANT: Store currentType (closed generic type from inheritance chain)
+                        // instead of property.ContainingType (open generic type definition)
+                        qualifyingProperties.Add((property, currentType));
                     }
                 }
             }
-            tempType = tempType.BaseType;
+            currentType = currentType.BaseType;
         }
 
-        // Reset for actual generation
-        processedProperties.Clear();
-
-        if (!hasPropertyInjections)
+        if (qualifyingProperties.Count == 0)
         {
-            writer.AppendLine("PropertyInjections = global::System.Array.Empty<global::TUnit.Core.PropertyInjectionData>(),");
+            return null;
         }
-        else
+
+        var writer = new CodeWriter(includeHeader: false);
+        writer.AppendLine("new global::TUnit.Core.PropertyInjectionData[]");
+        writer.AppendLine("{");
+        writer.Indent();
+
+        foreach (var (property, containingType) in qualifyingProperties)
         {
-            writer.AppendLine("PropertyInjections = new global::TUnit.Core.PropertyInjectionData[]");
+            var propertyType = property.Type.GloballyQualified();
+
+            writer.AppendLine("new global::TUnit.Core.PropertyInjectionData");
             writer.AppendLine("{");
             writer.Indent();
+            writer.AppendLine($"PropertyName = \"{property.Name}\",");
+            writer.AppendLine($"PropertyType = typeof({propertyType}),");
 
-            currentType = typeSymbol;
-            while (currentType != null)
+            // Generate appropriate setter based on whether property is init-only
+            if (property.SetMethod!.IsInitOnly)
             {
-                foreach (var member in currentType.GetMembers())
+                // For init-only properties, use UnsafeAccessor on .NET 8+ (but not for generic types)
+                // UnsafeAccessor doesn't work with open generic types
+                var containingTypeName = containingType.GloballyQualified();
+                var isGenericContainingType = containingType.IsGenericType;
+
+                if (isGenericContainingType)
                 {
-                    if (member is IPropertySymbol { DeclaredAccessibility: Accessibility.Public, SetMethod.DeclaredAccessibility: Accessibility.Public, IsStatic: false } property &&
-                        !processedProperties.Contains(property.Name))
+                    // For init-only properties on generic types, use reflection with the closed generic type.
+                    // UnsafeAccessor doesn't work with generic base classes, but reflection does.
+                    // This is AOT-compatible because we use the closed generic type known at compile time.
+                    writer.AppendLine("Setter = (instance, value) =>");
+                    writer.AppendLine("{");
+                    writer.Indent();
+                    writer.AppendLine($"var backingField = typeof({containingTypeName}).GetField(\"<{property.Name}>k__BackingField\",");
+                    writer.AppendLine("    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);");
+                    writer.AppendLine("if (backingField != null)");
+                    writer.AppendLine("{");
+                    writer.Indent();
+                    writer.AppendLine("backingField.SetValue(instance, value);");
+                    writer.Unindent();
+                    writer.AppendLine("}");
+                    writer.AppendLine("else");
+                    writer.AppendLine("{");
+                    writer.Indent();
+                    writer.AppendLine($"throw new global::System.InvalidOperationException(\"Could not find backing field for property {property.Name} on type {containingTypeName}\");");
+                    writer.Unindent();
+                    writer.AppendLine("}");
+                    writer.Unindent();
+                    writer.AppendLine("},");
+                }
+                else
+                {
+                    writer.AppendLine("#if NET8_0_OR_GREATER");
+                    // Cast to the property's containing type if needed
+                    if (containingTypeName != className)
                     {
-                        var dataSourceAttr = property.GetAttributes()
-                            .FirstOrDefault(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass));
-
-                        if (dataSourceAttr != null)
-                        {
-                            processedProperties.Add(property.Name);
-                            var propertyType = property.Type.GloballyQualified();
-
-                            writer.AppendLine("new global::TUnit.Core.PropertyInjectionData");
-                            writer.AppendLine("{");
-                            writer.Indent();
-                            writer.AppendLine($"PropertyName = \"{property.Name}\",");
-                            writer.AppendLine($"PropertyType = typeof({propertyType}),");
-
-                            // Generate appropriate setter based on whether property is init-only
-                            if (property.SetMethod.IsInitOnly)
-                            {
-                                // For init-only properties, use UnsafeAccessor on .NET 8+ (but not for generic types)
-                                // UnsafeAccessor doesn't work with open generic types
-                                // IMPORTANT: Use currentType (which is the closed generic type from the inheritance chain)
-                                // instead of property.ContainingType (which is the open generic type definition)
-                                var containingTypeName = currentType.GloballyQualified();
-                                var isGenericContainingType = currentType.IsGenericType;
-
-                                if (isGenericContainingType)
-                                {
-                                    // For init-only properties on generic types, use reflection with the closed generic type.
-                                    // UnsafeAccessor doesn't work with generic base classes, but reflection does.
-                                    // This is AOT-compatible because we use the closed generic type known at compile time.
-                                    writer.AppendLine("Setter = (instance, value) =>");
-                                    writer.AppendLine("{");
-                                    writer.Indent();
-                                    writer.AppendLine($"var backingField = typeof({containingTypeName}).GetField(\"<{property.Name}>k__BackingField\",");
-                                    writer.AppendLine("    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);");
-                                    writer.AppendLine("if (backingField != null)");
-                                    writer.AppendLine("{");
-                                    writer.Indent();
-                                    writer.AppendLine("backingField.SetValue(instance, value);");
-                                    writer.Unindent();
-                                    writer.AppendLine("}");
-                                    writer.AppendLine("else");
-                                    writer.AppendLine("{");
-                                    writer.Indent();
-                                    writer.AppendLine($"throw new global::System.InvalidOperationException(\"Could not find backing field for property {property.Name} on type {containingTypeName}\");");
-                                    writer.Unindent();
-                                    writer.AppendLine("}");
-                                    writer.Unindent();
-                                    writer.AppendLine("},");
-                                }
-                                else
-                                {
-                                    writer.AppendLine("#if NET8_0_OR_GREATER");
-                                    // Cast to the property's containing type if needed
-                                    if (containingTypeName != className)
-                                    {
-                                        writer.AppendLine($"Setter = (instance, value) => Get{property.Name}BackingField(({containingTypeName})instance) = ({propertyType})value,");
-                                    }
-                                    else
-                                    {
-                                        writer.AppendLine($"Setter = (instance, value) => Get{property.Name}BackingField(({className})instance) = ({propertyType})value,");
-                                    }
-                                    writer.AppendLine("#else");
-                                    writer.AppendLine("Setter = (instance, value) => throw new global::System.NotSupportedException(\"Setting init-only properties requires .NET 8 or later\"),");
-                                    writer.AppendLine("#endif");
-                                }
-                            }
-                            else
-                            {
-                                // For regular properties, use normal property assignment
-                                // For regular properties, use direct assignment (tuple conversion happens at runtime)
-                                writer.AppendLine($"Setter = (instance, value) => (({className})instance).{property.Name} = ({propertyType})value,");
-                            }
-
-                            // ValueFactory will be provided by the TestDataCombination at runtime
-                            writer.AppendLine("ValueFactory = () => throw new global::System.InvalidOperationException(\"ValueFactory should be provided by TestDataCombination\"),");
-
-                            // Generate nested property injections
-                            GenerateNestedPropertyInjections(writer, property.Type, processedProperties);
-
-                            // Generate nested property value factory
-                            GenerateNestedPropertyValueFactory(writer, property.Type);
-
-                            writer.Unindent();
-                            writer.AppendLine("},");
-                        }
+                        writer.AppendLine($"Setter = (instance, value) => Get{property.Name}BackingField(({containingTypeName})instance) = ({propertyType})value,");
                     }
+                    else
+                    {
+                        writer.AppendLine($"Setter = (instance, value) => Get{property.Name}BackingField(({className})instance) = ({propertyType})value,");
+                    }
+                    writer.AppendLine("#else");
+                    writer.AppendLine("Setter = (instance, value) => throw new global::System.NotSupportedException(\"Setting init-only properties requires .NET 8 or later\"),");
+                    writer.AppendLine("#endif");
                 }
-                currentType = currentType.BaseType;
             }
+            else
+            {
+                // For regular properties, use direct assignment (tuple conversion happens at runtime)
+                writer.AppendLine($"Setter = (instance, value) => (({className})instance).{property.Name} = ({propertyType})value,");
+            }
+
+            // ValueFactory will be provided by the TestDataCombination at runtime
+            writer.AppendLine("ValueFactory = () => throw new global::System.InvalidOperationException(\"ValueFactory should be provided by TestDataCombination\"),");
+
+            // Generate nested property injections
+            GenerateNestedPropertyInjections(writer, property.Type, processedNames);
+
+            // Generate nested property value factory
+            GenerateNestedPropertyValueFactory(writer, property.Type);
 
             writer.Unindent();
             writer.AppendLine("},");
         }
+
+        writer.Unindent();
+        writer.Append("}");
+        return writer.ToString();
     }
 
     private static void GeneratePropertyDataSources(CodeWriter writer, TestMethodMetadata testMethod)
@@ -2452,9 +2444,11 @@ private static string PreGenerateMetadataBlock(
         // Add optional named parameters only when non-default
         AppendOptionalFactoryParameters(writer, testMethod, className);
 
-        // Always emit filePath (it's almost never empty)
         writer.AppendLine(",");
-        writer.AppendLine($"filePath: @\"{filePath}\",");
+        if (!string.IsNullOrEmpty(filePath))
+        {
+            writer.AppendLine($"filePath: @\"{filePath}\",");
+        }
         writer.Append("testSessionId: testSessionId");
 
         writer.Unindent();
@@ -2576,7 +2570,10 @@ private static string PreGenerateMaterializerMethod(
         AppendOptionalFactoryParameters(writer, testMethod, className);
 
         writer.AppendLine(",");
-        writer.AppendLine($"filePath: @\"{filePath}\",");
+        if (!string.IsNullOrEmpty(filePath))
+        {
+            writer.AppendLine($"filePath: @\"{filePath}\",");
+        }
         writer.Append("testSessionId: testSessionId");
 
         writer.Unindent();
@@ -2796,65 +2793,52 @@ private static void AppendOptionalFactoryParameters(CodeWriter writer, TestMetho
     private static string? PreGeneratePropertyDataSourcesExpression(TestMethodMetadata testMethod)
     {
         var typeSymbol = testMethod.TypeSymbol;
-        var processedProperties = new HashSet<string>();
+        var processedNames = new HashSet<string>();
+        var qualifyingProperties = new List<(IPropertySymbol Property, AttributeData DataSourceAttr)>();
 
-        // Check if any property data sources exist
-        var tempType = typeSymbol;
-        while (tempType != null)
+        // Single pass: collect qualifying properties with their data source attributes
+        var currentType = typeSymbol;
+        while (currentType != null)
         {
-            foreach (var member in tempType.GetMembers())
+            foreach (var member in currentType.GetMembers())
             {
                 if (member is IPropertySymbol { DeclaredAccessibility: Accessibility.Public, IsStatic: false } property &&
-                    !processedProperties.Contains(property.Name))
+                    !processedNames.Contains(property.Name))
                 {
-                    if (property.GetAttributes().Any(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass)))
+                    var dataSourceAttr = property.GetAttributes()
+                        .FirstOrDefault(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass));
+
+                    if (dataSourceAttr != null)
                     {
-                        processedProperties.Add(property.Name);
+                        processedNames.Add(property.Name);
+                        qualifyingProperties.Add((property, dataSourceAttr));
                     }
                 }
             }
-            tempType = tempType.BaseType;
+            currentType = currentType.BaseType;
         }
 
-        if (processedProperties.Count == 0)
+        if (qualifyingProperties.Count == 0)
         {
             return null;
         }
 
-        processedProperties.Clear();
-
         var writer = new CodeWriter(includeHeader: false);
         writer.AppendLine("new global::TUnit.Core.PropertyDataSource[]");
         writer.AppendLine("{");
         writer.Indent();
 
-        var currentType = typeSymbol;
-        while (currentType != null)
+        foreach (var (property, dataSourceAttr) in qualifyingProperties)
         {
-            foreach (var member in currentType.GetMembers())
-            {
-                if (member is IPropertySymbol { DeclaredAccessibility: Accessibility.Public, IsStatic: false } property &&
-                    !processedProperties.Contains(property.Name))
-                {
-                    var dataSourceAttr = property.GetAttributes()
-                        .FirstOrDefault(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass));
-
-                    if (dataSourceAttr != null)
-                    {
-                        processedProperties.Add(property.Name);
-                        writer.AppendLine("new global::TUnit.Core.PropertyDataSource");
-                        writer.AppendLine("{");
-                        writer.Indent();
-                        writer.AppendLine($"PropertyName = \"{property.Name}\",");
-                        writer.AppendLine($"PropertyType = typeof({property.Type.GloballyQualified()}),");
-                        writer.Append("DataSource = ");
-                        GenerateDataSourceAttribute(writer, testMethod.CompilationContext, dataSourceAttr, testMethod.MethodSymbol, typeSymbol);
-                        writer.Unindent();
-                        writer.AppendLine("},");
-                    }
-                }
-            }
-            currentType = currentType.BaseType;
+            writer.AppendLine("new global::TUnit.Core.PropertyDataSource");
+            writer.AppendLine("{");
+            writer.Indent();
+            writer.AppendLine($"PropertyName = \"{property.Name}\",");
+            writer.AppendLine($"PropertyType = typeof({property.Type.GloballyQualified()}),");
+            writer.Append("DataSource = ");
+            GenerateDataSourceAttribute(writer, testMethod.CompilationContext, dataSourceAttr, testMethod.MethodSymbol, typeSymbol);
+            writer.Unindent();
+            writer.AppendLine("},");
         }
 
         writer.Unindent();
@@ -2867,58 +2851,7 @@ private static void AppendOptionalFactoryParameters(CodeWriter writer, TestMetho
     /// </summary>
     private static string? PreGeneratePropertyInjectionsExpression(INamedTypeSymbol typeSymbol, string className)
     {
-        var processedProperties = new HashSet<string>();
-
-        // Check if any property injections exist
-        var tempType = typeSymbol;
-        while (tempType != null)
-        {
-            foreach (var member in tempType.GetMembers())
-            {
-                if (member is IPropertySymbol { DeclaredAccessibility: Accessibility.Public, SetMethod.DeclaredAccessibility: Accessibility.Public, IsStatic: false } property &&
-                    !processedProperties.Contains(property.Name))
-                {
-                    if (property.GetAttributes().Any(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass)))
-                    {
-                        processedProperties.Add(property.Name);
-                    }
-                }
-            }
-            tempType = tempType.BaseType;
-        }
-
-        if (processedProperties.Count == 0)
-        {
-            return null;
-        }
-
-        // Use the existing method to generate, then extract the expression
-        processedProperties.Clear();
-        var writer = new CodeWriter(includeHeader: false);
-        GeneratePropertyInjections(writer, typeSymbol, className);
-        var output = writer.ToString().Trim();
-
-        // Output format: "PropertyInjections = <expression>,"
-        // Strip the prefix and trailing comma
-        const string prefix = "PropertyInjections = ";
-        if (!output.StartsWith(prefix))
-        {
-            return null;
-        }
-
-        var expr = output[prefix.Length..].TrimEnd();
-        if (expr.EndsWith(","))
-        {
-            expr = expr[..^1].TrimEnd();
-        }
-
-        // If it's an empty array, return null (use factory default)
-        if (expr.Contains("Array.Empty<"))
-        {
-            return null;
-        }
-
-        return expr;
+        return GeneratePropertyInjectionsExpression(typeSymbol, className);
     }
 
     /// <summary>

From ca4f28e8de2cbe4d23e42ff4d3781c9fceee98d8 Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:25:54 +0000
Subject: [PATCH 3/7] refactor: make testSessionId required in
 TestMetadataFactory.Create
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove the Guid.NewGuid() fallback — testSessionId is always provided
by generated code and should never be absent.
---
 TUnit.Core/TestMetadataFactory.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/TUnit.Core/TestMetadataFactory.cs b/TUnit.Core/TestMetadataFactory.cs
index 41be5d5041..6719a5fd7b 100644
--- a/TUnit.Core/TestMetadataFactory.cs
+++ b/TUnit.Core/TestMetadataFactory.cs
@@ -22,6 +22,7 @@ public static TestMetadata<T> Create<T>(
         Func<Attribute[]> attributeFactory,
         Func<Type[], object?[], T> instanceFactory,
         MethodMetadata methodMetadata,
+        string testSessionId,
         string filePath = "",
         int inheritanceDepth = 0,
         TestDependency[]? dependencies = null,
@@ -29,8 +30,7 @@ public static TestMetadata<T> Create<T>(
         IDataSourceAttribute[]? classDataSources = null,
         PropertyDataSource[]? propertyDataSources = null,
         PropertyInjectionData[]? propertyInjections = null,
-        int? repeatCount = null,
-        string? testSessionId = null
+        int? repeatCount = null
     ) where T : class
     {
         return new TestMetadata<T>
@@ -51,7 +51,7 @@ public static TestMetadata<T> Create<T>(
             InstanceFactory = instanceFactory,
             InvokeTypedTest = invokeTypedTest,
             RepeatCount = repeatCount,
-            TestSessionId = testSessionId ?? Guid.NewGuid().ToString(),
+            TestSessionId = testSessionId,
         };
     }
 }

From be5e6336705dd19b338ca16370cbbc2f4897a0a5 Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:36:06 +0000
Subject: [PATCH 4/7] fix: correct materializer indentation and hide factory
 types from IntelliSense

- Fix classMetadata indentation in __Materialize_* methods by using
  AppendRaw which properly re-indents each line of multi-line expressions
- Add [EditorBrowsable(Never)] to TestMetadataFactory and
  MethodMetadataFactory to hide infrastructure types from IntelliSense
- Update snapshot tests to reflect corrected indentation
---
 .../AbstractTests.Concrete2.verified.txt      |  20 +-
 .../AfterAllTests.Test.verified.txt           |  40 +-
 .../AfterTests.Test.verified.txt              |  40 +-
 .../ArgsAsArrayTests.Test.verified.txt        |  60 +--
 ...thImplicitConverterTests.Test.verified.txt |  40 +-
 ...lyLoaderTests.Test.DotNet10_0.verified.txt |  60 +--
 ...blyLoaderTests.Test.DotNet8_0.verified.txt |  60 +--
 ...blyLoaderTests.Test.DotNet9_0.verified.txt |  60 +--
 ...semblyLoaderTests.Test.Net4_7.verified.txt |  60 +--
 ...hodDataSourceDrivenTests.Test.verified.txt | 140 +++---
 .../AttributeTests.Test.verified.txt          |  20 +-
 .../BasicTests.Test.DotNet10_0.verified.txt   |  60 +--
 .../BasicTests.Test.DotNet8_0.verified.txt    |  60 +--
 .../BasicTests.Test.DotNet9_0.verified.txt    |  60 +--
 .../BasicTests.Test.Net4_7.verified.txt       |  60 +--
 .../BeforeAllTests.Test.verified.txt          |  40 +-
 .../BeforeTests.Test.verified.txt             |  40 +-
 ...lableTypeTest.Test.DotNet10_0.verified.txt |  20 +-
 ...llableTypeTest.Test.DotNet8_0.verified.txt |  20 +-
 ...llableTypeTest.Test.DotNet9_0.verified.txt |  20 +-
 ...1NullableTypeTest.Test.Net4_7.verified.txt |  20 +-
 ...sAndMethodArgumentsTests.Test.verified.txt | 114 ++---
 .../ClassConstructorTest.Test.verified.txt    |  64 +--
 ...assDataSourceDrivenTests.Test.verified.txt | 140 +++---
 ...ssDataSourceDrivenTests2.Test.verified.txt |  76 ++--
 ...ceDrivenTestsSharedKeyed.Test.verified.txt |  40 +-
 ...pleDataSourceDrivenTests.Test.verified.txt | 158 +++----
 .../ConcreteClassTests.Test.verified.txt      |  20 +-
 ...nflictingNamespace.DotNet10_0.verified.txt |  60 +--
 ...onflictingNamespace.DotNet8_0.verified.txt |  60 +--
 ...onflictingNamespace.DotNet9_0.verified.txt |  60 +--
 ...thConflictingNamespace.Net4_7.verified.txt |  60 +--
 ...nflictingNamespace.DotNet10_0.verified.txt | 200 ++++-----
 ...onflictingNamespace.DotNet8_0.verified.txt | 200 ++++-----
 ...onflictingNamespace.DotNet9_0.verified.txt | 200 ++++-----
 ...thConflictingNamespace.Net4_7.verified.txt | 200 ++++-----
 ...nflictingNamespace.DotNet10_0.verified.txt | 260 +++++------
 ...onflictingNamespace.DotNet8_0.verified.txt | 260 +++++------
 ...onflictingNamespace.DotNet9_0.verified.txt | 260 +++++------
 ...thConflictingNamespace.Net4_7.verified.txt | 260 +++++------
 ...nflictingNamespace.DotNet10_0.verified.txt | 140 +++---
 ...onflictingNamespace.DotNet8_0.verified.txt | 140 +++---
 ...onflictingNamespace.DotNet9_0.verified.txt | 140 +++---
 ...thConflictingNamespace.Net4_7.verified.txt | 140 +++---
 ...nflictingNamespace.DotNet10_0.verified.txt |  20 +-
 ...onflictingNamespace.DotNet8_0.verified.txt |  20 +-
 ...onflictingNamespace.DotNet9_0.verified.txt |  20 +-
 ...thConflictingNamespace.Net4_7.verified.txt |  20 +-
 .../ConstantArgumentsTests.Test.verified.txt  | 140 +++---
 ...ConstantInBaseClassTests.Test.verified.txt |  20 +-
 ...InterpolatedStringsTests.Test.verified.txt |  20 +-
 .../CustomDisplayNameTests.Test.verified.txt  | 414 +++++++++---------
 .../DataDrivenTests.Test.verified.txt         | 200 ++++-----
 ...ithDataSourceMethodTests.Test.verified.txt |  38 +-
 ...ataSourceGeneratorTests.Typed.verified.txt | 198 ++++-----
 ...aSourceGeneratorTests.Untyped.verified.txt |  20 +-
 .../DecimalArgumentTests.Test.verified.txt    | 240 +++++-----
 ...nScannerTests.Test.DotNet10_0.verified.txt |  60 +--
 ...onScannerTests.Test.DotNet8_0.verified.txt |  60 +--
 ...onScannerTests.Test.DotNet9_0.verified.txt |  60 +--
 ...ctionScannerTests.Test.Net4_7.verified.txt |  60 +--
 .../EnumMemberNamesTests.Test.verified.txt    |  20 +-
 ...bleDataSourceDrivenTests.Test.verified.txt |  60 +--
 ...pleDataSourceDrivenTests.Test.verified.txt |  20 +-
 ...xpectedArgumentTypeTests.Test.verified.txt |  40 +-
 ...cRegistry_WhenNoGenericsFound.verified.txt |  20 +-
 .../Hooks1589.Test.verified.txt               |  38 +-
 .../Hooks1594.Test.verified.txt               |  38 +-
 ...ritedPropertySetterTests.Test.verified.txt | 200 ++++-----
 ...romDifferentProjectTests.Test.verified.txt |  80 ++--
 ...heritsTestsAbstractTests.Test.verified.txt |  20 +-
 .../InheritsTestsTests.Test.verified.txt      |  46 +-
 .../Issue2887Tests.Test.verified.txt          |  38 +-
 .../MatrixTests.Test.verified.txt             | 260 +++++------
 ...hodDataSourceDrivenTests.Test.verified.txt | 140 +++---
 ...thCancellationTokenTests.Test.verified.txt |  20 +-
 ...assDataSourceDrivenTests.Test.verified.txt | 188 ++++----
 .../NameOfArgumentTests.Test.verified.txt     |  20 +-
 ...ullableByteArgumentTests.Test.verified.txt |  40 +-
 .../NumberArgumentTests.Test.verified.txt     | 120 ++---
 .../NumberArgumentTests.TestDE.verified.txt   | 120 ++---
 .../PriorityFilteringTests.Test.verified.txt  | 120 ++---
 .../PropertySetterTests.Test.verified.txt     | 200 ++++-----
 ...atTests.Assembly_Level_Repeat.verified.txt |  40 +-
 .../RepeatTests.Test.verified.txt             |  60 +--
 ...TAThreadTests.Test.DotNet10_0.verified.txt | 300 ++++++-------
 ...STAThreadTests.Test.DotNet8_0.verified.txt | 300 ++++++-------
 ...STAThreadTests.Test.DotNet9_0.verified.txt | 300 ++++++-------
 .../STAThreadTests.Test.Net4_7.verified.txt   | 300 ++++++-------
 .../StringArgumentTests.Test.verified.txt     |  40 +-
 .../Tests.Test.verified.txt                   |  60 +--
 .../Tests1538.Test.verified.txt               |  40 +-
 .../Tests1539.Test.verified.txt               |  20 +-
 .../Tests1589.Test.verified.txt               |  38 +-
 .../Tests1594.Test.verified.txt               |  38 +-
 .../Tests1603.Test.verified.txt               |  40 +-
 .../Tests1692.Test.verified.txt               |  20 +-
 .../Tests1821.Test.verified.txt               |  76 ++--
 .../Tests2083.Test.verified.txt               |  20 +-
 .../Tests2085.Test.verified.txt               |  40 +-
 .../Tests2112.Test.verified.txt               |  40 +-
 ...utCancellationTokenTests.Test.verified.txt | 304 ++++++-------
 ...pleDataSourceDrivenTests.Test.verified.txt |  20 +-
 ...st_AotSafeDataSourceFactories.verified.txt |  20 +-
 ...sts.Test_ConfigurationSupport.verified.txt |  20 +-
 ..._ModuleInitializer_Generation.verified.txt |  20 +-
 ...nglyTypedDelegates_Generation.verified.txt |  20 +-
 .../Generators/TestMetadataGenerator.cs       |   5 +-
 TUnit.Core/MethodMetadataFactory.cs           |   2 +
 TUnit.Core/TestMetadataFactory.cs             |   2 +
 110 files changed, 4949 insertions(+), 4946 deletions(-)

diff --git a/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt b/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
index 3cd29a32aa..600562fc22 100644
--- a/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
@@ -71,16 +71,16 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SecondTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-    Name = "ConcreteClass2",
-    Namespace = "TUnit.TestProject.AbstractTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+        Name = "ConcreteClass2",
+        Namespace = "TUnit.TestProject.AbstractTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
             "SecondTest", "SecondTest", 11,
diff --git a/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
index c24de70073..9d44688565 100644
--- a/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
@@ -100,16 +100,16 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-    Name = "CleanupTests",
-    Namespace = "TUnit.TestProject.AfterTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+        Name = "CleanupTests",
+        Namespace = "TUnit.TestProject.AfterTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
             "Test1", "Test1", 98,
@@ -122,16 +122,16 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-    Name = "CleanupTests",
-    Namespace = "TUnit.TestProject.AfterTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+        Name = "CleanupTests",
+        Namespace = "TUnit.TestProject.AfterTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
             "Test2", "Test2", 104,
diff --git a/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
index c24de70073..9d44688565 100644
--- a/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
@@ -100,16 +100,16 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-    Name = "CleanupTests",
-    Namespace = "TUnit.TestProject.AfterTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+        Name = "CleanupTests",
+        Namespace = "TUnit.TestProject.AfterTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
             "Test1", "Test1", 98,
@@ -122,16 +122,16 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-    Name = "CleanupTests",
-    Namespace = "TUnit.TestProject.AfterTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+        Name = "CleanupTests",
+        Namespace = "TUnit.TestProject.AfterTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
             "Test2", "Test2", 104,
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
index 9dc0aea192..52f6f9c3d6 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
@@ -295,16 +295,16 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Params__string__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-    Name = "ArgsAsArrayTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+        Name = "ArgsAsArrayTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
             "Params", "Params", 5,
@@ -330,16 +330,16 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ParamsEnumerable__IEnumerable_string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-    Name = "ArgsAsArrayTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+        Name = "ArgsAsArrayTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
             "ParamsEnumerable", "ParamsEnumerable", 15,
@@ -365,16 +365,16 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Following_Non_Params__int_IEnumerable_string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-    Name = "ArgsAsArrayTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+        Name = "ArgsAsArrayTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
             "Following_Non_Params", "Following_Non_Params", 25,
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
index 313240d7fd..3c0f8ea449 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
@@ -149,16 +149,16 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Explicit__ExplicitInteger(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-    Name = "ArgumentWithImplicitConverterTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
+        Name = "ArgumentWithImplicitConverterTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
             "Explicit", "Explicit", 8,
@@ -186,16 +186,16 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Implicit__ImplicitInteger(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-    Name = "ArgumentWithImplicitConverterTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
+        Name = "ArgumentWithImplicitConverterTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
             "Implicit", "Implicit", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
index 042b626d69..83d3587481 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
index 8e5c3a175b..0a70280a38 100644
--- a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
@@ -562,16 +562,16 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_SingleValue__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-    Name = "AsyncMethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+        Name = "AsyncMethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
             "AsyncMethodDataSource_SingleValue", "AsyncMethodDataSource_SingleValue", 8,
@@ -618,16 +618,16 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_Tuples__int_string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-    Name = "AsyncMethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+        Name = "AsyncMethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
             "AsyncMethodDataSource_Tuples", "AsyncMethodDataSource_Tuples", 15,
@@ -681,16 +681,16 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_Enumerable__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-    Name = "AsyncMethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+        Name = "AsyncMethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
             "AsyncMethodDataSource_Enumerable", "AsyncMethodDataSource_Enumerable", 23,
@@ -737,16 +737,16 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_Func__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-    Name = "AsyncMethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+        Name = "AsyncMethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
             "AsyncMethodDataSource_Func", "AsyncMethodDataSource_Func", 30,
@@ -793,16 +793,16 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_WithArguments__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-    Name = "AsyncMethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+        Name = "AsyncMethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
             "AsyncMethodDataSource_WithArguments", "AsyncMethodDataSource_WithArguments", 37,
@@ -849,16 +849,16 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsyncMethodDataSource_ExternalClass__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-    Name = "AsyncMethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+        Name = "AsyncMethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
             "AsyncMethodDataSource_ExternalClass", "AsyncMethodDataSource_ExternalClass", 44,
@@ -905,16 +905,16 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskMethodDataSource_SingleValue__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-    Name = "AsyncMethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+        Name = "AsyncMethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
             "ValueTaskMethodDataSource_SingleValue", "ValueTaskMethodDataSource_SingleValue", 51,
diff --git a/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
index fb090c7577..125ff30aa1 100644
--- a/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
@@ -81,16 +81,16 @@ internal static class TUnit_TestProject_AttributeTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MyTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AttributeTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AttributeTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
-    Name = "AttributeTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AttributeTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
+        Name = "AttributeTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AttributeTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AttributeTests>(
             "MyTest", "MyTest", 7,
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
index 042b626d69..83d3587481 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
index 6f345a5314..13656329a2 100644
--- a/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
@@ -100,16 +100,16 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-    Name = "SetupTests",
-    Namespace = "TUnit.TestProject.BeforeTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+        Name = "SetupTests",
+        Namespace = "TUnit.TestProject.BeforeTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
             "Test1", "Test1", 98,
@@ -122,16 +122,16 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-    Name = "SetupTests",
-    Namespace = "TUnit.TestProject.BeforeTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+        Name = "SetupTests",
+        Namespace = "TUnit.TestProject.BeforeTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
             "Test2", "Test2", 104,
diff --git a/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
index 6f345a5314..13656329a2 100644
--- a/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
@@ -100,16 +100,16 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-    Name = "SetupTests",
-    Namespace = "TUnit.TestProject.BeforeTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+        Name = "SetupTests",
+        Namespace = "TUnit.TestProject.BeforeTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
             "Test1", "Test1", 98,
@@ -122,16 +122,16 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-    Name = "SetupTests",
-    Namespace = "TUnit.TestProject.BeforeTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+        Name = "SetupTests",
+        Namespace = "TUnit.TestProject.BeforeTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
             "Test2", "Test2", 104,
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
index 8f22ff8451..30d5e128f5 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
@@ -70,16 +70,16 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._2971",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2971",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
             "SimpleTest", "SimpleTest", 19,
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
index 8f22ff8451..30d5e128f5 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
@@ -70,16 +70,16 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._2971",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2971",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
             "SimpleTest", "SimpleTest", 19,
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
index 8f22ff8451..30d5e128f5 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
@@ -70,16 +70,16 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._2971",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2971",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
             "SimpleTest", "SimpleTest", 19,
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
index 3809c8651e..68b3ef411b 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
@@ -70,16 +70,16 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._2971",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2971",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
             "SimpleTest", "SimpleTest", 19,
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
index 0e587ac3ac..af00e44a53 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
@@ -202,25 +202,25 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Simple(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-    Name = "ClassAndMethodArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(string))
-    {
-    Name = "arg1",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+        Name = "ClassAndMethodArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "arg1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
             "Simple", "Simple", 8,
@@ -238,25 +238,25 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_WithMethodLevel__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-    Name = "ClassAndMethodArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(string))
-    {
-    Name = "arg1",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+        Name = "ClassAndMethodArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "arg1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
             "WithMethodLevel", "WithMethodLevel", 11,
@@ -288,25 +288,25 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IgnoreParameters__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-    Name = "ClassAndMethodArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(string))
-    {
-    Name = "arg1",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+        Name = "ClassAndMethodArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "arg1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
             "IgnoreParameters", "IgnoreParameters", 16,
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
index 365cd4f1ac..6a12b14797 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
@@ -92,38 +92,38 @@ internal static class TUnit_TestProject_ClassConstructorTest__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassConstructorTest", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
-    Name = "ClassConstructorTest",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
-    {
-    Name = "dummyReferenceTypeClass",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
-    }
-    },
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
-    Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
-    Name = "DummyReferenceTypeClass",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
+        Name = "ClassConstructorTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
+        {
+        Name = "dummyReferenceTypeClass",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
+        }
+        },
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
+        Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
+        Name = "DummyReferenceTypeClass",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassConstructorTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassConstructorTest>(
             "Test", "Test", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
index b48bfb63ec..8e062c65c1 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
@@ -480,16 +480,16 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Class__SomeAsyncDisposableClass(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-    Name = "ClassDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+        Name = "ClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
             "DataSource_Class", "DataSource_Class", 9,
@@ -515,16 +515,16 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Class_Generic__SomeAsyncDisposableClass(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-    Name = "ClassDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+        Name = "ClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
             "DataSource_Class_Generic", "DataSource_Class_Generic", 16,
@@ -550,16 +550,16 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_1_ClassDataSource__InitializableClass(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-    Name = "ClassDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+        Name = "ClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
             "IsInitialized_With_1_ClassDataSource", "IsInitialized_With_1_ClassDataSource", 23,
@@ -585,16 +585,16 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_2_ClassDataSources__InitializableClass_InitializableClass(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-    Name = "ClassDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+        Name = "ClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
             "IsInitialized_With_2_ClassDataSources", "IsInitialized_With_2_ClassDataSources", 30,
@@ -627,16 +627,16 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_3_ClassDataSources__InitializableClass_InitializableClass_InitializableClass(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-    Name = "ClassDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+        Name = "ClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
             "IsInitialized_With_3_ClassDataSources", "IsInitialized_With_3_ClassDataSources", 38,
@@ -676,16 +676,16 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_4_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-    Name = "ClassDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+        Name = "ClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
             "IsInitialized_With_4_ClassDataSources", "IsInitialized_With_4_ClassDataSources", 47,
@@ -732,16 +732,16 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IsInitialized_With_5_ClassDataSources__InitializableClass_InitializableClass_InitializableClass_InitializableClass_InitializableClass(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-    Name = "ClassDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+        Name = "ClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
             "IsInitialized_With_5_ClassDataSources", "IsInitialized_With_5_ClassDataSources", 57,
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
index f2442c49dc..6349380627 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
@@ -124,25 +124,25 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Base_Derived1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-    Name = "ClassDataSourceDrivenTests2",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
-    {
-    Name = "base",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
+        Name = "ClassDataSourceDrivenTests2",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
+        {
+        Name = "base",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
             "Base_Derived1", "Base_Derived1", 12,
@@ -160,25 +160,25 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Base_Derived2(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-    Name = "ClassDataSourceDrivenTests2",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
-    {
-    Name = "base",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
+        Name = "ClassDataSourceDrivenTests2",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
+        {
+        Name = "base",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
             "Base_Derived2", "Base_Derived2", 18,
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
index 77b6520007..20103c63bd 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
@@ -147,16 +147,16 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Class__SomeAsyncDisposableClass(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-    Name = "ClassDataSourceDrivenTestsSharedKeyed",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
+        Name = "ClassDataSourceDrivenTestsSharedKeyed",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
             "DataSource_Class", "DataSource_Class", 9,
@@ -183,16 +183,16 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Class_Generic__SomeAsyncDisposableClass(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-    Name = "ClassDataSourceDrivenTestsSharedKeyed",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
+        Name = "ClassDataSourceDrivenTestsSharedKeyed",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
             "DataSource_Class_Generic", "DataSource_Class_Generic", 16,
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
index e630f7c776..7bfc44287f 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
@@ -374,85 +374,85 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
-    Name = "ClassTupleDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(string))
-    {
-    Name = "value2",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-    {
-    Name = "value3",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-    }
-    },
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
-    Type = typeof(global::System.ValueTuple<int, string, bool>),
-    Name = "Property1",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
-    Type = typeof(global::System.ValueTuple<int, string, bool>),
-    Name = "Property2",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
-    Type = typeof(global::System.ValueTuple<int, string, bool>),
-    Name = "Property3",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
-    Type = typeof(global::System.ValueTuple<int, string, bool>),
-    Name = "Property4",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
+        Name = "ClassTupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+        }
+        },
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
+        Type = typeof(global::System.ValueTuple<int, string, bool>),
+        Name = "Property1",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
+        Type = typeof(global::System.ValueTuple<int, string, bool>),
+        Name = "Property2",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
+        Type = typeof(global::System.ValueTuple<int, string, bool>),
+        Name = "Property3",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
+        Type = typeof(global::System.ValueTuple<int, string, bool>),
+        Name = "Property4",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassTupleDataSourceDrivenTests>(
             "DataSource_TupleMethod", "DataSource_TupleMethod", 27,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
index 3cd29a32aa..600562fc22 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
@@ -71,16 +71,16 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SecondTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-    Name = "ConcreteClass2",
-    Namespace = "TUnit.TestProject.AbstractTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+        Name = "ConcreteClass2",
+        Namespace = "TUnit.TestProject.AbstractTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
             "SecondTest", "SecondTest", 11,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
index 042b626d69..83d3587481 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
index 82edafbb6e..f8fb09ebb1 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -592,16 +592,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 8,
@@ -629,16 +629,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 17,
@@ -673,16 +673,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EnumValue", "EnumValue", 26,
@@ -710,16 +710,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NullValue", "NullValue", 35,
@@ -745,16 +745,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EmptyString", "EmptyString", 42,
@@ -780,16 +780,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NonEmptyString", "NonEmptyString", 49,
@@ -815,16 +815,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "BooleanString", "BooleanString", 56,
@@ -852,16 +852,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "Type", "Type", 65,
@@ -887,16 +887,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntegerArray", "IntegerArray", 72,
@@ -922,16 +922,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntMaxValue", "IntMaxValue", 79,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
index 82edafbb6e..f8fb09ebb1 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -592,16 +592,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 8,
@@ -629,16 +629,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 17,
@@ -673,16 +673,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EnumValue", "EnumValue", 26,
@@ -710,16 +710,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NullValue", "NullValue", 35,
@@ -745,16 +745,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EmptyString", "EmptyString", 42,
@@ -780,16 +780,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NonEmptyString", "NonEmptyString", 49,
@@ -815,16 +815,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "BooleanString", "BooleanString", 56,
@@ -852,16 +852,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "Type", "Type", 65,
@@ -887,16 +887,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntegerArray", "IntegerArray", 72,
@@ -922,16 +922,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntMaxValue", "IntMaxValue", 79,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
index 82edafbb6e..f8fb09ebb1 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -592,16 +592,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 8,
@@ -629,16 +629,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 17,
@@ -673,16 +673,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EnumValue", "EnumValue", 26,
@@ -710,16 +710,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NullValue", "NullValue", 35,
@@ -745,16 +745,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EmptyString", "EmptyString", 42,
@@ -780,16 +780,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NonEmptyString", "NonEmptyString", 49,
@@ -815,16 +815,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "BooleanString", "BooleanString", 56,
@@ -852,16 +852,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "Type", "Type", 65,
@@ -887,16 +887,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntegerArray", "IntegerArray", 72,
@@ -922,16 +922,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntMaxValue", "IntMaxValue", 79,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
index 863140a2af..4259b2d20f 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -592,16 +592,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 8,
@@ -629,16 +629,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 17,
@@ -673,16 +673,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EnumValue", "EnumValue", 26,
@@ -710,16 +710,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NullValue", "NullValue", 35,
@@ -745,16 +745,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EmptyString", "EmptyString", 42,
@@ -780,16 +780,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NonEmptyString", "NonEmptyString", 49,
@@ -815,16 +815,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "BooleanString", "BooleanString", 56,
@@ -852,16 +852,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "Type", "Type", 65,
@@ -887,16 +887,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntegerArray", "IntegerArray", 72,
@@ -922,16 +922,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntMaxValue", "IntMaxValue", 79,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
index 121b1cb82a..e3130fa2a0 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -828,16 +828,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_One", "MatrixTest_One", 9,
@@ -877,16 +877,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Two", "MatrixTest_Two", 19,
@@ -933,16 +933,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Enum", "MatrixTest_Enum", 30,
@@ -982,16 +982,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools", "AutoGenerateBools", 40,
@@ -1024,16 +1024,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools2", "AutoGenerateBools2", 49,
@@ -1066,16 +1066,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ImplicitConversion", "ImplicitConversion", 58,
@@ -1108,16 +1108,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
@@ -1150,16 +1150,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method1", "Method1", 116,
@@ -1185,16 +1185,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method2", "Method2", 124,
@@ -1220,16 +1220,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method3", "Method3", 132,
@@ -1255,16 +1255,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method4", "Method4", 140,
@@ -1290,16 +1290,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Exclusion", "Exclusion", 148,
@@ -1332,16 +1332,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
index 121b1cb82a..e3130fa2a0 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -828,16 +828,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_One", "MatrixTest_One", 9,
@@ -877,16 +877,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Two", "MatrixTest_Two", 19,
@@ -933,16 +933,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Enum", "MatrixTest_Enum", 30,
@@ -982,16 +982,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools", "AutoGenerateBools", 40,
@@ -1024,16 +1024,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools2", "AutoGenerateBools2", 49,
@@ -1066,16 +1066,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ImplicitConversion", "ImplicitConversion", 58,
@@ -1108,16 +1108,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
@@ -1150,16 +1150,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method1", "Method1", 116,
@@ -1185,16 +1185,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method2", "Method2", 124,
@@ -1220,16 +1220,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method3", "Method3", 132,
@@ -1255,16 +1255,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method4", "Method4", 140,
@@ -1290,16 +1290,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Exclusion", "Exclusion", 148,
@@ -1332,16 +1332,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
index 121b1cb82a..e3130fa2a0 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -828,16 +828,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_One", "MatrixTest_One", 9,
@@ -877,16 +877,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Two", "MatrixTest_Two", 19,
@@ -933,16 +933,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Enum", "MatrixTest_Enum", 30,
@@ -982,16 +982,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools", "AutoGenerateBools", 40,
@@ -1024,16 +1024,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools2", "AutoGenerateBools2", 49,
@@ -1066,16 +1066,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ImplicitConversion", "ImplicitConversion", 58,
@@ -1108,16 +1108,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
@@ -1150,16 +1150,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method1", "Method1", 116,
@@ -1185,16 +1185,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method2", "Method2", 124,
@@ -1220,16 +1220,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method3", "Method3", 132,
@@ -1255,16 +1255,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method4", "Method4", 140,
@@ -1290,16 +1290,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Exclusion", "Exclusion", 148,
@@ -1332,16 +1332,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
index 60f69d5bc7..ec46fcfc8a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -828,16 +828,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_One", "MatrixTest_One", 9,
@@ -877,16 +877,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Two", "MatrixTest_Two", 19,
@@ -933,16 +933,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Enum", "MatrixTest_Enum", 30,
@@ -982,16 +982,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools", "AutoGenerateBools", 40,
@@ -1024,16 +1024,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools2", "AutoGenerateBools2", 49,
@@ -1066,16 +1066,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ImplicitConversion", "ImplicitConversion", 58,
@@ -1108,16 +1108,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
@@ -1150,16 +1150,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method1", "Method1", 116,
@@ -1185,16 +1185,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method2", "Method2", 124,
@@ -1220,16 +1220,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method3", "Method3", 132,
@@ -1255,16 +1255,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method4", "Method4", 140,
@@ -1290,16 +1290,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Exclusion", "Exclusion", 148,
@@ -1332,16 +1332,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
index c6d3714cea..e681fd32f2 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -558,16 +558,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method", "DataSource_Method", 12,
@@ -604,16 +604,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method2", "DataSource_Method2", 19,
@@ -650,16 +650,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
@@ -696,16 +696,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method3", "DataSource_Method3", 33,
@@ -757,16 +757,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method4", "DataSource_Method4", 42,
@@ -845,16 +845,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
@@ -891,16 +891,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
index c6d3714cea..e681fd32f2 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -558,16 +558,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method", "DataSource_Method", 12,
@@ -604,16 +604,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method2", "DataSource_Method2", 19,
@@ -650,16 +650,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
@@ -696,16 +696,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method3", "DataSource_Method3", 33,
@@ -757,16 +757,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method4", "DataSource_Method4", 42,
@@ -845,16 +845,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
@@ -891,16 +891,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
index c6d3714cea..e681fd32f2 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -558,16 +558,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method", "DataSource_Method", 12,
@@ -604,16 +604,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method2", "DataSource_Method2", 19,
@@ -650,16 +650,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
@@ -696,16 +696,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method3", "DataSource_Method3", 33,
@@ -757,16 +757,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method4", "DataSource_Method4", 42,
@@ -845,16 +845,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
@@ -891,16 +891,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
index 1d0c7189e2..da0e86c598 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
@@ -558,16 +558,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method", "DataSource_Method", 12,
@@ -604,16 +604,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method2", "DataSource_Method2", 19,
@@ -650,16 +650,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
@@ -696,16 +696,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method3", "DataSource_Method3", 33,
@@ -757,16 +757,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method4", "DataSource_Method4", 42,
@@ -845,16 +845,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
@@ -891,16 +891,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
index 939ca1980a..9eef351dd2 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -116,16 +116,16 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-    Name = "TupleDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
             "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
index 939ca1980a..9eef351dd2 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -116,16 +116,16 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-    Name = "TupleDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
             "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
index 939ca1980a..9eef351dd2 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -116,16 +116,16 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-    Name = "TupleDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
             "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
index 5cb3b0cf76..d52363f53a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
@@ -116,16 +116,16 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-    Name = "TupleDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
             "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
index a19acc04d1..1c88a08ce3 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
@@ -408,16 +408,16 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_String1__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-    Name = "ConstantArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+        Name = "ConstantArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
             "String1", "String1", 16,
@@ -443,16 +443,16 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Int__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-    Name = "ConstantArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+        Name = "ConstantArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
             "Int", "Int", 23,
@@ -478,16 +478,16 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Double__double(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-    Name = "ConstantArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+        Name = "ConstantArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
             "Double", "Double", 30,
@@ -513,16 +513,16 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Float__float(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-    Name = "ConstantArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+        Name = "ConstantArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
             "Float", "Float", 37,
@@ -548,16 +548,16 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Long__long(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-    Name = "ConstantArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+        Name = "ConstantArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
             "Long", "Long", 44,
@@ -583,16 +583,16 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_UInt__uint(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-    Name = "ConstantArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+        Name = "ConstantArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
             "UInt", "UInt", 51,
@@ -618,16 +618,16 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ULong__ulong(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-    Name = "ConstantArgumentsTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+        Name = "ConstantArgumentsTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
             "ULong", "ULong", 58,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
index 6be2143395..adade6e383 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
@@ -90,16 +90,16 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantInBaseClassTests__Tes
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SomeTest__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
-    Name = "ConstantInBaseClassTests",
-    Namespace = "TUnit.TestProject.Bugs._1432",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
+        Name = "ConstantInBaseClassTests",
+        Namespace = "TUnit.TestProject.Bugs._1432",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests>(
             "SomeTest", "SomeTest", 13,
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
index 32610f1c6d..37fd47c858 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
@@ -90,16 +90,16 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantsInInterpolatedString
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SomeTest__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
-    Name = "ConstantsInInterpolatedStringsTests",
-    Namespace = "TUnit.TestProject.Bugs._1432",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
+        Name = "ConstantsInInterpolatedStringsTests",
+        Namespace = "TUnit.TestProject.Bugs._1432",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests>(
             "SomeTest", "SomeTest", 13,
diff --git a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
index 04ac0b7296..c07fb84c93 100644
--- a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
@@ -511,29 +511,29 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-    Name = "CustomDisplayNameTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-    Type = typeof(int),
-    Name = "Order",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "Test", "Test", 11,
@@ -546,29 +546,29 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-    Name = "CustomDisplayNameTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-    Type = typeof(int),
-    Name = "Order",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "Test2", "Test2", 18,
@@ -581,29 +581,29 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test3__string_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-    Name = "CustomDisplayNameTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-    Type = typeof(int),
-    Name = "Order",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "Test3", "Test3", 25,
@@ -644,29 +644,29 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MethodDataSourceTest__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-    Name = "CustomDisplayNameTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-    Type = typeof(int),
-    Name = "Order",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "MethodDataSourceTest", "MethodDataSourceTest", 37,
@@ -703,29 +703,29 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestParameterNamePrefixBug__int_string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-    Name = "CustomDisplayNameTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-    Type = typeof(int),
-    Name = "Order",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "TestParameterNamePrefixBug", "TestParameterNamePrefixBug", 45,
@@ -760,29 +760,29 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_PasswordTest__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-    Name = "CustomDisplayNameTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-    Type = typeof(int),
-    Name = "Order",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "PasswordTest", "PasswordTest", 65,
@@ -808,29 +808,29 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SameClassConstantTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-    Name = "CustomDisplayNameTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-    Type = typeof(int),
-    Name = "Order",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "SameClassConstantTest", "SameClassConstantTest", 72,
@@ -843,29 +843,29 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DifferentClassConstantTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-    Name = "CustomDisplayNameTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-    Type = typeof(int),
-    Name = "Order",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "DifferentClassConstantTest", "DifferentClassConstantTest", 79,
@@ -878,29 +878,29 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NestedClassConstantTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-    Name = "CustomDisplayNameTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-    Type = typeof(int),
-    Name = "Order",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+        Name = "CustomDisplayNameTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+        Type = typeof(int),
+        Name = "Order",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
             "NestedClassConstantTest", "NestedClassConstantTest", 86,
diff --git a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
index 863140a2af..4259b2d20f 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
@@ -592,16 +592,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 8,
@@ -629,16 +629,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int_string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "DataSource_Method", "DataSource_Method", 17,
@@ -673,16 +673,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumValue__TestEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EnumValue", "EnumValue", 26,
@@ -710,16 +710,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullValue__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NullValue", "NullValue", 35,
@@ -745,16 +745,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "EmptyString", "EmptyString", 42,
@@ -780,16 +780,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonEmptyString__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "NonEmptyString", "NonEmptyString", 49,
@@ -815,16 +815,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BooleanString__bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "BooleanString", "BooleanString", 56,
@@ -852,16 +852,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Type__Type(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "Type", "Type", 65,
@@ -887,16 +887,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntegerArray__int__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntegerArray", "IntegerArray", 72,
@@ -922,16 +922,16 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_IntMaxValue__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-    Name = "DataDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+        Name = "DataDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
             "IntMaxValue", "IntMaxValue", 79,
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
index 107eaab94c..1a71799592 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
@@ -177,25 +177,25 @@ internal static class TUnit_TestProject_DataSourceClassCombinedWithDataSourceMet
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSourceClassCombinedWithDataSourceMethodTest__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
-    Name = "DataSourceClassCombinedWithDataSourceMethod",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "i",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
+        Name = "DataSourceClassCombinedWithDataSourceMethod",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "i",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod>(
             "DataSourceClassCombinedWithDataSourceMethodTest", "DataSourceClassCombinedWithDataSourceMethodTest", 13,
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
index a532187805..a118a0d840 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
@@ -267,39 +267,39 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_GeneratedData_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-    Name = "DataSourceGeneratorTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(string))
-    {
-    Name = "value2",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-    {
-    Name = "value3",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+        Name = "DataSourceGeneratorTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
             "GeneratedData_Method", "GeneratedData_Method", 12,
@@ -330,39 +330,39 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_GeneratedData_Method2__int_string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-    Name = "DataSourceGeneratorTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(string))
-    {
-    Name = "value2",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-    {
-    Name = "value3",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+        Name = "DataSourceGeneratorTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
             "GeneratedData_Method2", "GeneratedData_Method2", 18,
@@ -407,39 +407,39 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_GeneratedData_Method3__int_string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-    Name = "DataSourceGeneratorTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(string))
-    {
-    Name = "value2",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(bool))
-    {
-    Name = "value3",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+        Name = "DataSourceGeneratorTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(string))
+        {
+        Name = "value2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(bool))
+        {
+        Name = "value3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
             "GeneratedData_Method3", "GeneratedData_Method3", 24,
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
index 28368a4c6c..9e58d7b7e1 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
@@ -110,16 +110,16 @@ internal static class TUnit_TestProject_AutoDataTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1__string_int_double_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AutoDataTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AutoDataTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
-    Name = "AutoDataTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AutoDataTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
+        Name = "AutoDataTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AutoDataTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AutoDataTests>(
             "Test1", "Test1", 7,
diff --git a/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
index d29e4ffe3c..d30748d4da 100644
--- a/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
@@ -737,16 +737,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Transfer__decimal_decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "Transfer", "Transfer", 9,
@@ -781,16 +781,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SimpleDecimal__decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "SimpleDecimal", "SimpleDecimal", 29,
@@ -816,16 +816,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SmallDecimal__decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "SmallDecimal", "SmallDecimal", 36,
@@ -851,16 +851,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MaxDecimal__decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "MaxDecimal", "MaxDecimal", 43,
@@ -886,16 +886,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MinDecimal__decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "MinDecimal", "MinDecimal", 50,
@@ -921,16 +921,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExplicitDecimalValue__decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "ExplicitDecimalValue", "ExplicitDecimalValue", 57,
@@ -956,16 +956,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MultipleDecimals__decimal_decimal_decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "MultipleDecimals", "MultipleDecimals", 64,
@@ -1005,16 +1005,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test__decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "Test", "Test", 73,
@@ -1042,16 +1042,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TransactionDiscountCalculations__decimal_decimal_decimal_decimal_decimal_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "TransactionDiscountCalculations", "TransactionDiscountCalculations", 82,
@@ -1114,16 +1114,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Equality3__decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "Equality3", "Equality3", 91,
@@ -1149,16 +1149,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Equality4__decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "Equality4", "Equality4", 104,
@@ -1184,16 +1184,16 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestMethod__decimal(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-    Name = "DecimalArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+        Name = "DecimalArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
             "TestMethod", "TestMethod", 119,
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
index 4ea5f35ed0..b57e7abfd5 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
index 042b626d69..83d3587481 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
@@ -133,16 +133,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "SynchronousTest", "SynchronousTest", 5,
@@ -155,16 +155,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "AsynchronousTest", "AsynchronousTest", 11,
@@ -177,16 +177,16 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ValueTaskAsynchronousTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.BasicTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-    Name = "BasicTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.BasicTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+        Name = "BasicTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
             "ValueTaskAsynchronousTest", "ValueTaskAsynchronousTest", 17,
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
index 780df1bf5c..ad6094adc4 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
@@ -93,16 +93,16 @@ internal static class TUnit_TestProject_Bugs__1432_EnumMemberNamesTests__TestSou
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SomeTest__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
-    Name = "EnumMemberNamesTests",
-    Namespace = "TUnit.TestProject.Bugs._1432",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
+        Name = "EnumMemberNamesTests",
+        Namespace = "TUnit.TestProject.Bugs._1432",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests>(
             "SomeTest", "SomeTest", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
index e6cc8f9090..04c8932fc5 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
@@ -260,16 +260,16 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-    Name = "EnumerableDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+        Name = "EnumerableDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
             "DataSource_Method", "DataSource_Method", 8,
@@ -316,16 +316,16 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-    Name = "EnumerableDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+        Name = "EnumerableDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
             "DataSource_Method2", "DataSource_Method2", 15,
@@ -372,16 +372,16 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-    Name = "EnumerableDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+        Name = "EnumerableDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
             "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 22,
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
index f93c4cc669..97f9b44328 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
@@ -148,16 +148,16 @@ internal static class TUnit_TestProject_EnumerableTupleDataSourceDrivenTests__Te
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
-    Name = "EnumerableTupleDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
+        Name = "EnumerableTupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests>(
             "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
index 660c54ca59..3ef4c96f48 100644
--- a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
@@ -183,16 +183,16 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TypedArguments__object_Type(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-    Name = "ExpectedArgumentTypeTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
+        Name = "ExpectedArgumentTypeTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
             "TypedArguments", "TypedArguments", 8,
@@ -237,16 +237,16 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumTypes__object_Type_Type(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-    Name = "ExpectedArgumentTypeTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
+        Name = "ExpectedArgumentTypeTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
             "EnumTypes", "EnumTypes", 25,
diff --git a/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
index ab857558f3..9203ca228d 100644
--- a/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
@@ -69,16 +69,16 @@ internal static class TUnit_TestProject_SimpleTestClass__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonGenericTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("GenericTypeResolverTests:global::TUnit.TestProject.SimpleTestClass", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.SimpleTestClass),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
-    Name = "SimpleTestClass",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.SimpleTestClass),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
+        Name = "SimpleTestClass",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.SimpleTestClass);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.SimpleTestClass>(
             "NonGenericTest", "NonGenericTest", 7,
diff --git a/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
index ec0bd5654e..0573435a3d 100644
--- a/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
@@ -85,25 +85,25 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-    Name = "MyTests",
-    Namespace = "TUnit.TestProject.Bugs._1589",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-    {
-    Name = "myFixture",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+        Name = "MyTests",
+        Namespace = "TUnit.TestProject.Bugs._1589",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+        {
+        Name = "myFixture",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
             "Test1", "Test1", 15,
diff --git a/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
index a6ab7acc29..b0617094f7 100644
--- a/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
@@ -86,25 +86,25 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-    Name = "MyTests",
-    Namespace = "TUnit.TestProject.Bugs._1594",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-    {
-    Name = "myFixture",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+        Name = "MyTests",
+        Namespace = "TUnit.TestProject.Bugs._1594",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+        {
+        Name = "myFixture",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
             "Test1", "Test1", 15,
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
index aac08c7754..76b1b57dfb 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
@@ -326,106 +326,106 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-    Name = "PropertySetterTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-    Type = typeof(string),
-    Name = "Property1",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-    Type = typeof(string),
-    Name = "Property2",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-    Name = "Property3",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-    Name = "Property4",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-    Name = "Property5",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-    Name = "Property6",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-    Type = typeof(string),
-    Name = "Property7",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-    Name = "StaticProperty",
-    IsStatic = true,
-    IsNullable = false,
-    Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+        Name = "PropertySetterTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+        Type = typeof(string),
+        Name = "Property1",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+        Type = typeof(string),
+        Name = "Property2",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property3",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property4",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property5",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property6",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+        Type = typeof(string),
+        Name = "Property7",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+        Name = "StaticProperty",
+        IsStatic = true,
+        IsNullable = false,
+        Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
             "Test", "Test", 69,
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
index 06890cad4c..19e4f8940c 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
@@ -223,16 +223,16 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-    Name = "InheritedTestsFromDifferentProjectTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+        Name = "InheritedTestsFromDifferentProjectTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
             "Test", "Test", 9,
@@ -245,16 +245,16 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_GenericMethodDataSource__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-    Name = "InheritedTestsFromDifferentProjectTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+        Name = "InheritedTestsFromDifferentProjectTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
             "GenericMethodDataSource", "GenericMethodDataSource", 14,
@@ -280,16 +280,16 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NonGenericMethodDataSource__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-    Name = "InheritedTestsFromDifferentProjectTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+        Name = "InheritedTestsFromDifferentProjectTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
             "NonGenericMethodDataSource", "NonGenericMethodDataSource", 20,
@@ -326,16 +326,16 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_VerifyInheritedCategoriesAreAvailable(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-    Name = "InheritedTestsFromDifferentProjectTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+        Name = "InheritedTestsFromDifferentProjectTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
             "VerifyInheritedCategoriesAreAvailable", "VerifyInheritedCategoriesAreAvailable", 26,
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
index 3cd29a32aa..600562fc22 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
@@ -71,16 +71,16 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SecondTest(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-    Name = "ConcreteClass2",
-    Namespace = "TUnit.TestProject.AbstractTests",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+        Name = "ConcreteClass2",
+        Namespace = "TUnit.TestProject.AbstractTests",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
             "SecondTest", "SecondTest", 11,
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
index ebb8e19fb2..b06387f621 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
@@ -139,29 +139,29 @@ internal static class TUnit_TestProject_Bugs__1924_None_BaseClass__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1924.None.BaseClass", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
-    Name = "BaseClass",
-    Namespace = "TUnit.TestProject.Bugs._1924.None",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
-    Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-    Name = "Data",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
+        Name = "BaseClass",
+        Namespace = "TUnit.TestProject.Bugs._1924.None",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
+        Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+        Name = "Data",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1924.None.BaseClass>(
             "Test", "Test", 11,
diff --git a/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
index db37bb1804..1057f45812 100644
--- a/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
@@ -79,25 +79,25 @@ internal static class TUnit_TestProject_Bugs__Issue2887_ActualTestClass__TestSou
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
-    Name = "ActualTestClass",
-    Namespace = "TUnit.TestProject.Bugs._Issue2887",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
-    {
-    Name = "serviceProvider",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
+        Name = "ActualTestClass",
+        Namespace = "TUnit.TestProject.Bugs._Issue2887",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
+        {
+        Name = "serviceProvider",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass>(
             "Test1", "Test1", 26,
diff --git a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
index 6d35698b06..bbdd905702 100644
--- a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
@@ -828,16 +828,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_One__string_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_One", "MatrixTest_One", 9,
@@ -877,16 +877,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Two__int_int_int_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Two", "MatrixTest_Two", 19,
@@ -933,16 +933,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest_Enum__int_TestEnum_TestEnum_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixTest_Enum", "MatrixTest_Enum", 30,
@@ -982,16 +982,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools__string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools", "AutoGenerateBools", 40,
@@ -1024,16 +1024,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_AutoGenerateBools2__string_bool_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "AutoGenerateBools2", "AutoGenerateBools2", 49,
@@ -1066,16 +1066,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ImplicitConversion__OneOf_TestEnum__TestEnum2__bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ImplicitConversion", "ImplicitConversion", 58,
@@ -1108,16 +1108,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ExcludingAutoGeneratedMatrixValues__CountToTenEnum_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "ExcludingAutoGeneratedMatrixValues", "ExcludingAutoGeneratedMatrixValues", 67,
@@ -1150,16 +1150,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method1__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method1", "Method1", 116,
@@ -1185,16 +1185,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method2", "Method2", 124,
@@ -1220,16 +1220,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method3", "Method3", 132,
@@ -1255,16 +1255,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Method4", "Method4", 140,
@@ -1290,16 +1290,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Exclusion__int_int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "Exclusion", "Exclusion", 148,
@@ -1332,16 +1332,16 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixMethod_WithEnumParameter_UsesOnlyMethodValues__bool_CountToTenEnum(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MatrixTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-    Name = "MatrixTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MatrixTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+        Name = "MatrixTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
             "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", "MatrixMethod_WithEnumParameter_UsesOnlyMethodValues", 197,
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
index 1d0c7189e2..da0e86c598 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
@@ -558,16 +558,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method", "DataSource_Method", 12,
@@ -604,16 +604,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method2__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method2", "DataSource_Method2", 19,
@@ -650,16 +650,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method_WithAction__Action(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method_WithAction", "DataSource_Method_WithAction", 26,
@@ -696,16 +696,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method3__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method3", "DataSource_Method3", 33,
@@ -757,16 +757,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_Method4__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_Method4", "DataSource_Method4", 42,
@@ -845,16 +845,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_WithBaseReturn__BaseValue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "DataSource_WithBaseReturn", "DataSource_WithBaseReturn", 53,
@@ -891,16 +891,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_EnumerableFuncArrayTest__string__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-    Name = "MethodDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+        Name = "MethodDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
             "EnumerableFuncArrayTest", "EnumerableFuncArrayTest", 59,
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
index 4f246f9d90..a49d2da617 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
@@ -211,16 +211,16 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenWithCancellationTo
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MyTest__int_CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
-    Name = "MethodDataSourceDrivenWithCancellationTokenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
+        Name = "MethodDataSourceDrivenWithCancellationTokenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests>(
             "MyTest", "MyTest", 12,
diff --git a/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
index c7f882fc74..8610dae092 100644
--- a/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
@@ -152,53 +152,53 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-    Name = "MultipleClassDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
-    {
-    Name = "inject1",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
-    {
-    Name = "inject2",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
-    {
-    Name = "inject3",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
-    {
-    Name = "inject4",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
-    {
-    Name = "inject5",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
+        Name = "MultipleClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
+        {
+        Name = "inject1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
+        {
+        Name = "inject2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
+        {
+        Name = "inject3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
+        {
+        Name = "inject4",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
+        {
+        Name = "inject5",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
             "Test1", "Test1", 17,
@@ -216,53 +216,53 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-    Name = "MultipleClassDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
-    {
-    Name = "inject1",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
-    {
-    Name = "inject2",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
-    {
-    Name = "inject3",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
-    {
-    Name = "inject4",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
-    },
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
-    {
-    Name = "inject5",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
+        Name = "MultipleClassDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
+        {
+        Name = "inject1",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
+        {
+        Name = "inject2",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
+        {
+        Name = "inject3",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
+        {
+        Name = "inject4",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
+        },
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
+        {
+        Name = "inject5",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
             "Test2", "Test2", 23,
diff --git a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
index 46e1d4c8ac..97dc084b0e 100644
--- a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
@@ -90,16 +90,16 @@ internal static class TUnit_TestProject_NameOfArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestName__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NameOfArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
-    Name = "NameOfArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
+        Name = "NameOfArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NameOfArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NameOfArgumentTests>(
             "TestName", "TestName", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
index a311148895..46a4e26965 100644
--- a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
@@ -154,16 +154,16 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test__byte_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-    Name = "NullableByteArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
+        Name = "NullableByteArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NullableByteArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
             "Test", "Test", 8,
@@ -190,16 +190,16 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2__byte_byte_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-    Name = "NullableByteArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
+        Name = "NullableByteArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NullableByteArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
             "Test2", "Test2", 15,
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
index cc2991941f..31e04365bb 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
@@ -361,16 +361,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Int__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "Int", "Int", 8,
@@ -396,16 +396,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Double__double(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "Double", "Double", 15,
@@ -431,16 +431,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Float__float(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "Float", "Float", 22,
@@ -466,16 +466,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Long__long(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "Long", "Long", 29,
@@ -501,16 +501,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ULong__ulong(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "ULong", "ULong", 36,
@@ -536,16 +536,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_UInt__uint(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "UInt", "UInt", 43,
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
index cc2991941f..31e04365bb 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
@@ -361,16 +361,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Int__int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "Int", "Int", 8,
@@ -396,16 +396,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Double__double(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "Double", "Double", 15,
@@ -431,16 +431,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Float__float(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "Float", "Float", 22,
@@ -466,16 +466,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Long__long(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "Long", "Long", 29,
@@ -501,16 +501,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_ULong__ulong(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "ULong", "ULong", 36,
@@ -536,16 +536,16 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_UInt__uint(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-    Name = "NumberArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+        Name = "NumberArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
             "UInt", "UInt", 43,
diff --git a/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
index 7c77ba05a5..4893920bd7 100644
--- a/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
@@ -245,16 +245,16 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_High_1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-    Name = "PriorityFilteringTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+        Name = "PriorityFilteringTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "High_1", "High_1", 12,
@@ -267,16 +267,16 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_High_2(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-    Name = "PriorityFilteringTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+        Name = "PriorityFilteringTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "High_2", "High_2", 18,
@@ -289,16 +289,16 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_High_3(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-    Name = "PriorityFilteringTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+        Name = "PriorityFilteringTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "High_3", "High_3", 24,
@@ -311,16 +311,16 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Medium_1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-    Name = "PriorityFilteringTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+        Name = "PriorityFilteringTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "Medium_1", "Medium_1", 30,
@@ -333,16 +333,16 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Medium_2(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-    Name = "PriorityFilteringTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+        Name = "PriorityFilteringTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "Medium_2", "Medium_2", 36,
@@ -355,16 +355,16 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Low_1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-    Name = "PriorityFilteringTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+        Name = "PriorityFilteringTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
             "Low_1", "Low_1", 42,
diff --git a/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
index e36e7a4543..5ed46bd67c 100644
--- a/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
@@ -326,106 +326,106 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-    Name = "PropertySetterTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = new global::TUnit.Core.PropertyMetadata[]
-    {
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-    Type = typeof(string),
-    Name = "Property1",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-    Type = typeof(string),
-    Name = "Property2",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-    Name = "Property3",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-    Name = "Property4",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-    Name = "Property5",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-    Name = "Property6",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-    Type = typeof(string),
-    Name = "Property7",
-    IsStatic = false,
-    IsNullable = false,
-    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    },
-    new global::TUnit.Core.PropertyMetadata
-    {
-    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-    Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-    Name = "StaticProperty",
-    IsStatic = true,
-    IsNullable = false,
-    Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-    ClassMetadata = null!,
-    ContainingTypeMetadata = null!
-    }
-    },
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+        Name = "PropertySetterTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = new global::TUnit.Core.PropertyMetadata[]
+        {
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+        Type = typeof(string),
+        Name = "Property1",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+        Type = typeof(string),
+        Name = "Property2",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property3",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property4",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property5",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+        Name = "Property6",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+        Type = typeof(string),
+        Name = "Property7",
+        IsStatic = false,
+        IsNullable = false,
+        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        },
+        new global::TUnit.Core.PropertyMetadata
+        {
+        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+        Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+        Name = "StaticProperty",
+        IsStatic = true,
+        IsNullable = false,
+        Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+        ClassMetadata = null!,
+        ContainingTypeMetadata = null!
+        }
+        },
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
             "Test", "Test", 69,
diff --git a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
index fdcbccc2ff..45ef4a351f 100644
--- a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
@@ -114,16 +114,16 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithAssemblyRepeat(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-    Name = "AssemblyRepeatTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
+        Name = "AssemblyRepeatTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AssemblyRepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
             "TestWithAssemblyRepeat", "TestWithAssemblyRepeat", 9,
@@ -137,16 +137,16 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithMethodRepeatOverride(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-    Name = "AssemblyRepeatTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
+        Name = "AssemblyRepeatTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AssemblyRepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
             "TestWithMethodRepeatOverride", "TestWithMethodRepeatOverride", 14,
diff --git a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
index b51529b36e..44401144b4 100644
--- a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
@@ -160,16 +160,16 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_One(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.RepeatTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-    Name = "RepeatTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.RepeatTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+        Name = "RepeatTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.RepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
             "One", "One", 9,
@@ -183,16 +183,16 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Two(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.RepeatTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-    Name = "RepeatTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.RepeatTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+        Name = "RepeatTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.RepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
             "Two", "Two", 16,
@@ -206,16 +206,16 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Three(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.RepeatTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-    Name = "RepeatTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.RepeatTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+        Name = "RepeatTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.RepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
             "Three", "Three", 23,
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
index 7c88630198..29ba021cac 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
@@ -547,16 +547,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_With_STA(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "With_STA", "With_STA", 14,
@@ -570,16 +570,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Without_STA(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "Without_STA", "Without_STA", 20,
@@ -593,16 +593,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithSimpleAwait(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
@@ -616,16 +616,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskYield(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskYield", "STA_WithTaskYield", 36,
@@ -639,16 +639,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithConfigureAwaitTrue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
@@ -662,16 +662,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithNestedAsyncCalls(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
@@ -685,16 +685,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskFromResult(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
@@ -708,16 +708,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithCompletedTask(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
@@ -731,16 +731,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskRun(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskRun", "STA_WithTaskRun", 83,
@@ -754,16 +754,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithMultipleAwaits(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
@@ -777,16 +777,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithAsyncEnumerable(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
@@ -800,16 +800,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskWhenAll(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
@@ -823,16 +823,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithExceptionHandling(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
@@ -846,16 +846,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithThrowsNothingAssertion(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
@@ -869,16 +869,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithFuncAssertion(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
index 7c88630198..29ba021cac 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
@@ -547,16 +547,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_With_STA(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "With_STA", "With_STA", 14,
@@ -570,16 +570,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Without_STA(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "Without_STA", "Without_STA", 20,
@@ -593,16 +593,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithSimpleAwait(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
@@ -616,16 +616,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskYield(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskYield", "STA_WithTaskYield", 36,
@@ -639,16 +639,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithConfigureAwaitTrue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
@@ -662,16 +662,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithNestedAsyncCalls(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
@@ -685,16 +685,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskFromResult(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
@@ -708,16 +708,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithCompletedTask(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
@@ -731,16 +731,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskRun(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskRun", "STA_WithTaskRun", 83,
@@ -754,16 +754,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithMultipleAwaits(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
@@ -777,16 +777,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithAsyncEnumerable(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
@@ -800,16 +800,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskWhenAll(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
@@ -823,16 +823,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithExceptionHandling(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
@@ -846,16 +846,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithThrowsNothingAssertion(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
@@ -869,16 +869,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithFuncAssertion(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
index 7c88630198..29ba021cac 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
@@ -547,16 +547,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_With_STA(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "With_STA", "With_STA", 14,
@@ -570,16 +570,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Without_STA(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "Without_STA", "Without_STA", 20,
@@ -593,16 +593,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithSimpleAwait(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
@@ -616,16 +616,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskYield(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskYield", "STA_WithTaskYield", 36,
@@ -639,16 +639,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithConfigureAwaitTrue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
@@ -662,16 +662,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithNestedAsyncCalls(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
@@ -685,16 +685,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskFromResult(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
@@ -708,16 +708,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithCompletedTask(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
@@ -731,16 +731,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskRun(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskRun", "STA_WithTaskRun", 83,
@@ -754,16 +754,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithMultipleAwaits(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
@@ -777,16 +777,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithAsyncEnumerable(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
@@ -800,16 +800,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskWhenAll(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
@@ -823,16 +823,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithExceptionHandling(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
@@ -846,16 +846,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithThrowsNothingAssertion(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
@@ -869,16 +869,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithFuncAssertion(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
index a6eface3dd..eea2ac1500 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
@@ -547,16 +547,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_With_STA(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "With_STA", "With_STA", 14,
@@ -570,16 +570,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Without_STA(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "Without_STA", "Without_STA", 20,
@@ -593,16 +593,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithSimpleAwait(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithSimpleAwait", "STA_WithSimpleAwait", 26,
@@ -616,16 +616,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskYield(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskYield", "STA_WithTaskYield", 36,
@@ -639,16 +639,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithConfigureAwaitTrue(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithConfigureAwaitTrue", "STA_WithConfigureAwaitTrue", 45,
@@ -662,16 +662,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithNestedAsyncCalls(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithNestedAsyncCalls", "STA_WithNestedAsyncCalls", 54,
@@ -685,16 +685,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskFromResult(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskFromResult", "STA_WithTaskFromResult", 64,
@@ -708,16 +708,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithCompletedTask(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithCompletedTask", "STA_WithCompletedTask", 74,
@@ -731,16 +731,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskRun(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskRun", "STA_WithTaskRun", 83,
@@ -754,16 +754,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithMultipleAwaits(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithMultipleAwaits", "STA_WithMultipleAwaits", 98,
@@ -777,16 +777,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithAsyncEnumerable(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithAsyncEnumerable", "STA_WithAsyncEnumerable", 116,
@@ -800,16 +800,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithTaskWhenAll(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithTaskWhenAll", "STA_WithTaskWhenAll", 130,
@@ -823,16 +823,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithExceptionHandling(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithExceptionHandling", "STA_WithExceptionHandling", 147,
@@ -846,16 +846,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithThrowsNothingAssertion(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithThrowsNothingAssertion", "STA_WithThrowsNothingAssertion", 194,
@@ -869,16 +869,16 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_STA_WithFuncAssertion(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.STAThreadTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-    Name = "STAThreadTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.STAThreadTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+        Name = "STAThreadTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
             "STA_WithFuncAssertion", "STA_WithFuncAssertion", 211,
diff --git a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
index 3f535f36e7..bf21542b70 100644
--- a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
@@ -163,16 +163,16 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Normal__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-    Name = "StringArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.StringArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
+        Name = "StringArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.StringArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
             "Normal", "Normal", 8,
@@ -209,16 +209,16 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Nullable__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-    Name = "StringArgumentTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.StringArgumentTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
+        Name = "StringArgumentTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.StringArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
             "Nullable", "Nullable", 27,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
index 7594489942..5bf3d6f026 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
@@ -213,16 +213,16 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TryParse_InvalidString_ReturnsFailure__string__CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1304",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1304",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
             "TryParse_InvalidString_ReturnsFailure", "TryParse_InvalidString_ReturnsFailure", 9,
@@ -259,16 +259,16 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Parse_InvalidString_ThrowsException__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1304",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1304",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
             "Parse_InvalidString_ThrowsException", "Parse_InvalidString_ThrowsException", 26,
@@ -298,16 +298,16 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TryParse_ValidString_ReturnsAccountId__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1304",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1304",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
             "TryParse_ValidString_ReturnsAccountId", "TryParse_ValidString_ReturnsAccountId", 38,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
index 5cb193a9ba..b2d74da32e 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
@@ -341,16 +341,16 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Eight_Args__bool_string__string__string__string__string__string__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1538",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1538",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1538.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
             "Eight_Args", "Eight_Args", 8,
@@ -446,16 +446,16 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_SixteenArgs__bool_string__string__string__string__string__string__string__string__string__string__string__string__string__string__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1538",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1538",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1538.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
             "SixteenArgs", "SixteenArgs", 16,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
index 4b00305516..37f1b85177 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
@@ -74,16 +74,16 @@ internal static class TUnit_TestProject_Bugs__1539_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1539.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1539",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1539",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1539.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1539.Tests>(
             "Test", "Test", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
index ec0bd5654e..0573435a3d 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
@@ -85,25 +85,25 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-    Name = "MyTests",
-    Namespace = "TUnit.TestProject.Bugs._1589",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-    {
-    Name = "myFixture",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+        Name = "MyTests",
+        Namespace = "TUnit.TestProject.Bugs._1589",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+        {
+        Name = "myFixture",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
             "Test1", "Test1", 15,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
index a6ab7acc29..b0617094f7 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
@@ -86,25 +86,25 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test1(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-    Name = "MyTests",
-    Namespace = "TUnit.TestProject.Bugs._1594",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-    {
-    Name = "myFixture",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+        Name = "MyTests",
+        Namespace = "TUnit.TestProject.Bugs._1594",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+        {
+        Name = "myFixture",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
             "Test1", "Test1", 15,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
index 5da5001162..5ef677c61a 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
@@ -143,16 +143,16 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Casted_Integer_To_Short_Converts__short(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1603",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1603",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1603.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
             "Casted_Integer_To_Short_Converts", "Casted_Integer_To_Short_Converts", 8,
@@ -178,16 +178,16 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Integer_To_Short_Converts__short(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1603",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1603",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1603.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
             "Integer_To_Short_Converts", "Integer_To_Short_Converts", 15,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
index e7a262fbe9..e3077492b0 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
@@ -91,16 +91,16 @@ internal static class TUnit_TestProject_Bugs__1692_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_NullTest__string_(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1692.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1692",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1692",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1692.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1692.Tests>(
             "NullTest", "NullTest", 10,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
index 62957460c9..a6d9bcb1ce 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
@@ -161,25 +161,25 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MethodDataSource__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1821",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
-    {
-    Name = "data",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1821",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
+        {
+        Name = "data",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1821.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
             "MethodDataSource", "MethodDataSource", 9,
@@ -209,25 +209,25 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixDataSource__string(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._1821",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
-    {
-    Name = "data",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._1821",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
+        {
+        Name = "data",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1821.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
             "MatrixDataSource", "MatrixDataSource", 16,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
index 66b2271c4f..83091dd274 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
@@ -96,16 +96,16 @@ internal static class TUnit_TestProject_Bugs__2083_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MyTest__long(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2083.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._2083",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2083",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2083.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2083.Tests>(
             "MyTest", "MyTest", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
index deac881ded..7355bc33e2 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
@@ -143,16 +143,16 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Double_SpecialConsts__double(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._2085",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2085",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2085.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
             "Double_SpecialConsts", "Double_SpecialConsts", 8,
@@ -178,16 +178,16 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Float_SpecialConsts__float(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._2085",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2085",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2085.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
             "Float_SpecialConsts", "Float_SpecialConsts", 15,
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
index 99dc0da007..6b50b0eea1 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
@@ -221,16 +221,16 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test__int_long__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._2112",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2112",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2112.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
             "Test", "Test", 8,
@@ -264,16 +264,16 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_Test2__int_long__(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-    Name = "Tests",
-    Namespace = "TUnit.TestProject.Bugs._2112",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
+        Name = "Tests",
+        Namespace = "TUnit.TestProject.Bugs._2112",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2112.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
             "Test2", "Test2", 15,
diff --git a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
index 261a295c55..0f7ad88fa0 100644
--- a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
@@ -582,25 +582,25 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DefaultTest__CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-    Name = "TimeoutCancellationTokenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+        Name = "TimeoutCancellationTokenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
             "DefaultTest", "DefaultTest", 14,
@@ -647,25 +647,25 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_BasicTest__CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-    Name = "TimeoutCancellationTokenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+        Name = "TimeoutCancellationTokenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
             "BasicTest", "BasicTest", 21,
@@ -712,25 +712,25 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_InheritedTimeoutAttribute__CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-    Name = "TimeoutCancellationTokenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+        Name = "TimeoutCancellationTokenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
             "InheritedTimeoutAttribute", "InheritedTimeoutAttribute", 30,
@@ -777,25 +777,25 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataTest__int_CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-    Name = "TimeoutCancellationTokenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+        Name = "TimeoutCancellationTokenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
             "DataTest", "DataTest", 38,
@@ -853,25 +853,25 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSourceTest__int_CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-    Name = "TimeoutCancellationTokenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+        Name = "TimeoutCancellationTokenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
             "DataSourceTest", "DataSourceTest", 48,
@@ -950,25 +950,25 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_MatrixTest__int_CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-    Name = "TimeoutCancellationTokenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+        Name = "TimeoutCancellationTokenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
             "MatrixTest", "MatrixTest", 58,
@@ -1154,25 +1154,25 @@ internal static class TUnit_TestProject_TimeoutDoesNotFireTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_QuickTestDoesNotTimeout__CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutDoesNotFireTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
-    Name = "TimeoutDoesNotFireTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
+        Name = "TimeoutDoesNotFireTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutDoesNotFireTests>(
             "QuickTestDoesNotTimeout", "QuickTestDoesNotTimeout", 86,
@@ -1347,25 +1347,25 @@ internal static class TUnit_TestProject_CancellationTokenTriggeredTests__TestSou
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_CancellationTokenIsTriggered__CancellationToken(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CancellationTokenTriggeredTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
-    Name = "CancellationTokenTriggeredTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = new global::TUnit.Core.ParameterMetadata[]
-    {
-    new global::TUnit.Core.ParameterMetadata(typeof(int))
-    {
-    Name = "value",
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-    IsNullable = false,
-    ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-    }
-    },
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
+        Name = "CancellationTokenTriggeredTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = new global::TUnit.Core.ParameterMetadata[]
+        {
+        new global::TUnit.Core.ParameterMetadata(typeof(int))
+        {
+        Name = "value",
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+        IsNullable = false,
+        ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+        }
+        },
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CancellationTokenTriggeredTests>(
             "CancellationTokenIsTriggered", "CancellationTokenIsTriggered", 106,
diff --git a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
index 5cb3b0cf76..d52363f53a 100644
--- a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
@@ -116,16 +116,16 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_DataSource_TupleMethod__int_string_bool(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-    Name = "TupleDataSourceDrivenTests",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+        Name = "TupleDataSourceDrivenTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
             "DataSource_TupleMethod", "DataSource_TupleMethod", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
index 2a8665dbb3..b423ea3c17 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
@@ -105,16 +105,16 @@ internal static class TUnit_TestProject_AotDataSourceTest__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithDataSource__int_int_int(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.AotDataSourceTest", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
-    Name = "AotDataSourceTest",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
+        Name = "AotDataSourceTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.AotDataSourceTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AotDataSourceTest>(
             "TestWithDataSource", "TestWithDataSource", 7,
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
index 608d160749..1698843ec5 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
@@ -69,16 +69,16 @@ internal static class TUnit_TestProject_ConfigurationTest__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithConfiguration(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ConfigurationTest", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ConfigurationTest),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
-    Name = "ConfigurationTest",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ConfigurationTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
+        Name = "ConfigurationTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ConfigurationTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConfigurationTest>(
             "TestWithConfiguration", "TestWithConfiguration", 7,
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
index 5d97b8b8b8..ec38be63a1 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
@@ -69,16 +69,16 @@ internal static class TUnit_TestProject_ModuleInitializerTest__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithModuleInit(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ModuleInitializerTest", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
-    Name = "ModuleInitializerTest",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
+        Name = "ModuleInitializerTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.ModuleInitializerTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ModuleInitializerTest>(
             "TestWithModuleInit", "TestWithModuleInit", 8,
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
index 0de4655801..a409f64a3a 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
@@ -69,16 +69,16 @@ internal static class TUnit_TestProject_TypedDelegateTest__TestSource
     private static global::System.Collections.Generic.IReadOnlyList<global::TUnit.Core.TestMetadata> __Materialize_TestWithDelegate(string testSessionId)
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.TypedDelegateTest", new global::TUnit.Core.ClassMetadata
-    {
-    Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
-    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
-    Name = "TypedDelegateTest",
-    Namespace = "TUnit.TestProject",
-    Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-    Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-    Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-    Parent = null
-    });
+        {
+        Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
+        Name = "TypedDelegateTest",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+        });
         var __classType = typeof(global::TUnit.TestProject.TypedDelegateTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TypedDelegateTest>(
             "TestWithDelegate", "TestWithDelegate", 7,
diff --git a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
index 7328a60b27..c43094991f 100644
--- a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
+++ b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
@@ -2552,9 +2552,8 @@ private static string PreGenerateMaterializerMethod(
         var filePath = (testMethod.FilePath ?? "").Replace("\\", "\\\\");
 
         // Inline shared locals (can't reference GetTests locals from a separate method)
-        var classMetadataExpr = MetadataGenerationHelper.GenerateClassMetadataGetOrAddWithParentExpression(testMethod.TypeSymbol, writer.IndentLevel);
-        writer.AppendLine($"var __classMetadata = {classMetadataExpr};");
-        writer.AppendLine($"var __classType = typeof({className});");
+        // Use AppendRaw to properly indent the multi-line ClassMetadata expression
+        writer.AppendRaw(PreGenerateSharedLocals(testMethod.TypeSymbol, className));
 
         // Build MethodMetadata factory call
         var methodMetadataCall = GenerateMethodMetadataFactoryCall(testMethod.MethodSymbol);
diff --git a/TUnit.Core/MethodMetadataFactory.cs b/TUnit.Core/MethodMetadataFactory.cs
index f4c95b4e6e..350f223901 100644
--- a/TUnit.Core/MethodMetadataFactory.cs
+++ b/TUnit.Core/MethodMetadataFactory.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 
 namespace TUnit.Core;
@@ -7,6 +8,7 @@ namespace TUnit.Core;
 /// Replaces inline <c>new MethodMetadata { ... }</c> object initializers in generated code,
 /// reducing per-method IL size and JIT-compiled native code.
 /// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
 public static class MethodMetadataFactory
 {
     [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2067",
diff --git a/TUnit.Core/TestMetadataFactory.cs b/TUnit.Core/TestMetadataFactory.cs
index 6719a5fd7b..0cece67064 100644
--- a/TUnit.Core/TestMetadataFactory.cs
+++ b/TUnit.Core/TestMetadataFactory.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 
 namespace TUnit.Core;
@@ -8,6 +9,7 @@ namespace TUnit.Core;
 /// (reference types share native code), so replacing 1,000 inline object initializers with calls
 /// to this shared factory dramatically reduces JIT-compiled native code size.
 /// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
 public static class TestMetadataFactory
 {
     [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2091",

From 16d3ade154e6e0f4b5e2e889caaccfba0958fc52 Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:48:47 +0000
Subject: [PATCH 5/7] fix: correct ClassMetadata property indentation in
 generated code

Use standard indent string in GenerateClassMetadataGetOrAddWithParentExpression
so properties inside ClassMetadata { ... } blocks are properly indented relative
to the opening brace in both GetTests() and __Materialize_* paths.
---
 .../AbstractTests.Concrete2.verified.txt      |  32 +-
 .../AfterAllTests.Test.verified.txt           |  48 +-
 .../AfterTests.Test.verified.txt              |  48 +-
 .../ArgsAsArrayTests.Test.verified.txt        |  64 +--
 ...thImplicitConverterTests.Test.verified.txt |  48 +-
 ...lyLoaderTests.Test.DotNet10_0.verified.txt |  64 +--
 ...blyLoaderTests.Test.DotNet8_0.verified.txt |  64 +--
 ...blyLoaderTests.Test.DotNet9_0.verified.txt |  64 +--
 ...semblyLoaderTests.Test.Net4_7.verified.txt |  64 +--
 ...hodDataSourceDrivenTests.Test.verified.txt | 128 +++---
 .../AttributeTests.Test.verified.txt          |  32 +-
 .../BasicTests.Test.DotNet10_0.verified.txt   |  64 +--
 .../BasicTests.Test.DotNet8_0.verified.txt    |  64 +--
 .../BasicTests.Test.DotNet9_0.verified.txt    |  64 +--
 .../BasicTests.Test.Net4_7.verified.txt       |  64 +--
 .../BeforeAllTests.Test.verified.txt          |  48 +-
 .../BeforeTests.Test.verified.txt             |  48 +-
 ...lableTypeTest.Test.DotNet10_0.verified.txt |  32 +-
 ...llableTypeTest.Test.DotNet8_0.verified.txt |  32 +-
 ...llableTypeTest.Test.DotNet9_0.verified.txt |  32 +-
 ...1NullableTypeTest.Test.Net4_7.verified.txt |  32 +-
 ...sAndMethodArgumentsTests.Test.verified.txt | 136 +++---
 .../ClassConstructorTest.Test.verified.txt    | 120 ++---
 ...assDataSourceDrivenTests.Test.verified.txt | 128 +++---
 ...ssDataSourceDrivenTests2.Test.verified.txt | 102 ++---
 ...ceDrivenTestsSharedKeyed.Test.verified.txt |  48 +-
 ...pleDataSourceDrivenTests.Test.verified.txt | 308 ++++++-------
 .../ConcreteClassTests.Test.verified.txt      |  32 +-
 ...nflictingNamespace.DotNet10_0.verified.txt |  64 +--
 ...onflictingNamespace.DotNet8_0.verified.txt |  64 +--
 ...onflictingNamespace.DotNet9_0.verified.txt |  64 +--
 ...thConflictingNamespace.Net4_7.verified.txt |  64 +--
 ...nflictingNamespace.DotNet10_0.verified.txt | 176 ++++----
 ...onflictingNamespace.DotNet8_0.verified.txt | 176 ++++----
 ...onflictingNamespace.DotNet9_0.verified.txt | 176 ++++----
 ...thConflictingNamespace.Net4_7.verified.txt | 176 ++++----
 ...nflictingNamespace.DotNet10_0.verified.txt | 224 +++++-----
 ...onflictingNamespace.DotNet8_0.verified.txt | 224 +++++-----
 ...onflictingNamespace.DotNet9_0.verified.txt | 224 +++++-----
 ...thConflictingNamespace.Net4_7.verified.txt | 224 +++++-----
 ...nflictingNamespace.DotNet10_0.verified.txt | 128 +++---
 ...onflictingNamespace.DotNet8_0.verified.txt | 128 +++---
 ...onflictingNamespace.DotNet9_0.verified.txt | 128 +++---
 ...thConflictingNamespace.Net4_7.verified.txt | 128 +++---
 ...nflictingNamespace.DotNet10_0.verified.txt |  32 +-
 ...onflictingNamespace.DotNet8_0.verified.txt |  32 +-
 ...onflictingNamespace.DotNet9_0.verified.txt |  32 +-
 ...thConflictingNamespace.Net4_7.verified.txt |  32 +-
 .../ConstantArgumentsTests.Test.verified.txt  | 128 +++---
 ...ConstantInBaseClassTests.Test.verified.txt |  32 +-
 ...InterpolatedStringsTests.Test.verified.txt |  32 +-
 .../CustomDisplayNameTests.Test.verified.txt  | 420 +++++++++---------
 .../DataDrivenTests.Test.verified.txt         | 176 ++++----
 ...ithDataSourceMethodTests.Test.verified.txt |  68 +--
 ...ataSourceGeneratorTests.Typed.verified.txt | 248 +++++------
 ...aSourceGeneratorTests.Untyped.verified.txt |  32 +-
 .../DecimalArgumentTests.Test.verified.txt    | 208 ++++-----
 ...nScannerTests.Test.DotNet10_0.verified.txt |  64 +--
 ...onScannerTests.Test.DotNet8_0.verified.txt |  64 +--
 ...onScannerTests.Test.DotNet9_0.verified.txt |  64 +--
 ...ctionScannerTests.Test.Net4_7.verified.txt |  64 +--
 .../EnumMemberNamesTests.Test.verified.txt    |  32 +-
 ...bleDataSourceDrivenTests.Test.verified.txt |  64 +--
 ...pleDataSourceDrivenTests.Test.verified.txt |  32 +-
 ...xpectedArgumentTypeTests.Test.verified.txt |  48 +-
 ...cRegistry_WhenNoGenericsFound.verified.txt |  32 +-
 .../Hooks1589.Test.verified.txt               |  68 +--
 .../Hooks1594.Test.verified.txt               |  68 +--
 ...ritedPropertySetterTests.Test.verified.txt | 392 ++++++++--------
 ...romDifferentProjectTests.Test.verified.txt |  80 ++--
 ...heritsTestsAbstractTests.Test.verified.txt |  32 +-
 .../InheritsTestsTests.Test.verified.txt      |  84 ++--
 .../Issue2887Tests.Test.verified.txt          |  68 +--
 .../MatrixTests.Test.verified.txt             | 224 +++++-----
 ...hodDataSourceDrivenTests.Test.verified.txt | 128 +++---
 ...thCancellationTokenTests.Test.verified.txt |  32 +-
 ...assDataSourceDrivenTests.Test.verified.txt | 270 +++++------
 .../NameOfArgumentTests.Test.verified.txt     |  32 +-
 ...ullableByteArgumentTests.Test.verified.txt |  48 +-
 .../NumberArgumentTests.Test.verified.txt     | 112 ++---
 .../NumberArgumentTests.TestDE.verified.txt   | 112 ++---
 .../PriorityFilteringTests.Test.verified.txt  | 112 ++---
 .../PropertySetterTests.Test.verified.txt     | 392 ++++++++--------
 ...atTests.Assembly_Level_Repeat.verified.txt |  48 +-
 .../RepeatTests.Test.verified.txt             |  64 +--
 ...TAThreadTests.Test.DotNet10_0.verified.txt | 256 +++++------
 ...STAThreadTests.Test.DotNet8_0.verified.txt | 256 +++++------
 ...STAThreadTests.Test.DotNet9_0.verified.txt | 256 +++++------
 .../STAThreadTests.Test.Net4_7.verified.txt   | 256 +++++------
 .../StringArgumentTests.Test.verified.txt     |  48 +-
 .../Tests.Test.verified.txt                   |  64 +--
 .../Tests1538.Test.verified.txt               |  48 +-
 .../Tests1539.Test.verified.txt               |  32 +-
 .../Tests1589.Test.verified.txt               |  68 +--
 .../Tests1594.Test.verified.txt               |  68 +--
 .../Tests1603.Test.verified.txt               |  48 +-
 .../Tests1692.Test.verified.txt               |  32 +-
 .../Tests1821.Test.verified.txt               | 102 ++---
 .../Tests2083.Test.verified.txt               |  32 +-
 .../Tests2085.Test.verified.txt               |  48 +-
 .../Tests2112.Test.verified.txt               |  48 +-
 ...utCancellationTokenTests.Test.verified.txt | 374 ++++++++--------
 ...pleDataSourceDrivenTests.Test.verified.txt |  32 +-
 ...st_AotSafeDataSourceFactories.verified.txt |  32 +-
 ...sts.Test_ConfigurationSupport.verified.txt |  32 +-
 ..._ModuleInitializer_Generation.verified.txt |  32 +-
 ...nglyTypedDelegates_Generation.verified.txt |  32 +-
 .../Utilities/MetadataGenerationHelper.cs     |   2 +-
 108 files changed, 5439 insertions(+), 5439 deletions(-)

diff --git a/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt b/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
index 600562fc22..6293a6d7dc 100644
--- a/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-        Name = "ConcreteClass2",
-        Namespace = "TUnit.TestProject.AbstractTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+            Name = "ConcreteClass2",
+            Namespace = "TUnit.TestProject.AbstractTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
         var metadata_SecondTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
@@ -72,14 +72,14 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-        Name = "ConcreteClass2",
-        Namespace = "TUnit.TestProject.AbstractTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+            Name = "ConcreteClass2",
+            Namespace = "TUnit.TestProject.AbstractTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
diff --git a/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
index 9d44688565..a3939b6ff2 100644
--- a/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-        Name = "CleanupTests",
-        Namespace = "TUnit.TestProject.AfterTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+            Name = "CleanupTests",
+            Namespace = "TUnit.TestProject.AfterTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
@@ -101,14 +101,14 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-        Name = "CleanupTests",
-        Namespace = "TUnit.TestProject.AfterTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+            Name = "CleanupTests",
+            Namespace = "TUnit.TestProject.AfterTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
@@ -123,14 +123,14 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-        Name = "CleanupTests",
-        Namespace = "TUnit.TestProject.AfterTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+            Name = "CleanupTests",
+            Namespace = "TUnit.TestProject.AfterTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
index 9d44688565..a3939b6ff2 100644
--- a/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-        Name = "CleanupTests",
-        Namespace = "TUnit.TestProject.AfterTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+            Name = "CleanupTests",
+            Namespace = "TUnit.TestProject.AfterTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
@@ -101,14 +101,14 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-        Name = "CleanupTests",
-        Namespace = "TUnit.TestProject.AfterTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+            Name = "CleanupTests",
+            Namespace = "TUnit.TestProject.AfterTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
@@ -123,14 +123,14 @@ internal static class TUnit_TestProject_AfterTests_CleanupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
-        Name = "CleanupTests",
-        Namespace = "TUnit.TestProject.AfterTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
+            Name = "CleanupTests",
+            Namespace = "TUnit.TestProject.AfterTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AfterTests.CleanupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AfterTests.CleanupTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
index 52f6f9c3d6..6ad319092e 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-        Name = "ArgsAsArrayTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+            Name = "ArgsAsArrayTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
         var metadata_Params__string__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
@@ -296,14 +296,14 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-        Name = "ArgsAsArrayTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+            Name = "ArgsAsArrayTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
@@ -331,14 +331,14 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-        Name = "ArgsAsArrayTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+            Name = "ArgsAsArrayTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
@@ -366,14 +366,14 @@ internal static class TUnit_TestProject_ArgsAsArrayTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgsAsArrayTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
-        Name = "ArgsAsArrayTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ArgsAsArrayTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgsAsArrayTests)),
+            Name = "ArgsAsArrayTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ArgsAsArrayTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgsAsArrayTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
index 3c0f8ea449..130a2b2348 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-        Name = "ArgumentWithImplicitConverterTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
+            Name = "ArgumentWithImplicitConverterTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests);
         var metadata_Explicit__ExplicitInteger = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
@@ -150,14 +150,14 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-        Name = "ArgumentWithImplicitConverterTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
+            Name = "ArgumentWithImplicitConverterTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
@@ -187,14 +187,14 @@ internal static class TUnit_TestProject_ArgumentWithImplicitConverterTests__Test
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ArgumentWithImplicitConverterTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
-        Name = "ArgumentWithImplicitConverterTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests)),
+            Name = "ArgumentWithImplicitConverterTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ArgumentWithImplicitConverterTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
index 83d3587481..3a7445c2f0 100644
--- a/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AssemblyLoaderTests.Test.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
index 0a70280a38..5b54da2fa7 100644
--- a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-        Name = "AsyncMethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+            Name = "AsyncMethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata_AsyncMethodDataSource_SingleValue__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -563,14 +563,14 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-        Name = "AsyncMethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+            Name = "AsyncMethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -619,14 +619,14 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-        Name = "AsyncMethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+            Name = "AsyncMethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -682,14 +682,14 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-        Name = "AsyncMethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+            Name = "AsyncMethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -738,14 +738,14 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-        Name = "AsyncMethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+            Name = "AsyncMethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -794,14 +794,14 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-        Name = "AsyncMethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+            Name = "AsyncMethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -850,14 +850,14 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-        Name = "AsyncMethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+            Name = "AsyncMethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
@@ -906,14 +906,14 @@ internal static class TUnit_TestProject_AsyncMethodDataSourceDrivenTests__TestSo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
-        Name = "AsyncMethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests)),
+            Name = "AsyncMethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AsyncMethodDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
index 125ff30aa1..36fe10f511 100644
--- a/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AttributeTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AttributeTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AttributeTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AttributeTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
-        Name = "AttributeTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AttributeTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
+            Name = "AttributeTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AttributeTests);
         var metadata_MyTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AttributeTests>(
@@ -82,14 +82,14 @@ internal static class TUnit_TestProject_AttributeTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AttributeTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AttributeTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
-        Name = "AttributeTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AttributeTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AttributeTests)),
+            Name = "AttributeTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AttributeTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AttributeTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
index 83d3587481..3a7445c2f0 100644
--- a/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BasicTests.Test.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
index 13656329a2..cd3c773802 100644
--- a/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BeforeAllTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-        Name = "SetupTests",
-        Namespace = "TUnit.TestProject.BeforeTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+            Name = "SetupTests",
+            Namespace = "TUnit.TestProject.BeforeTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
@@ -101,14 +101,14 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-        Name = "SetupTests",
-        Namespace = "TUnit.TestProject.BeforeTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+            Name = "SetupTests",
+            Namespace = "TUnit.TestProject.BeforeTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
@@ -123,14 +123,14 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-        Name = "SetupTests",
-        Namespace = "TUnit.TestProject.BeforeTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+            Name = "SetupTests",
+            Namespace = "TUnit.TestProject.BeforeTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
index 13656329a2..cd3c773802 100644
--- a/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/BeforeTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-        Name = "SetupTests",
-        Namespace = "TUnit.TestProject.BeforeTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+            Name = "SetupTests",
+            Namespace = "TUnit.TestProject.BeforeTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
@@ -101,14 +101,14 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-        Name = "SetupTests",
-        Namespace = "TUnit.TestProject.BeforeTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+            Name = "SetupTests",
+            Namespace = "TUnit.TestProject.BeforeTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
@@ -123,14 +123,14 @@ internal static class TUnit_TestProject_BeforeTests_SetupTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BeforeTests.SetupTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
-        Name = "SetupTests",
-        Namespace = "TUnit.TestProject.BeforeTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BeforeTests.SetupTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BeforeTests.SetupTests)),
+            Name = "SetupTests",
+            Namespace = "TUnit.TestProject.BeforeTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BeforeTests.SetupTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BeforeTests.SetupTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
index 30d5e128f5..436e7f9cc7 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2971",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2971",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata_SimpleTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
@@ -71,14 +71,14 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2971",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2971",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
index 30d5e128f5..436e7f9cc7 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2971",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2971",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata_SimpleTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
@@ -71,14 +71,14 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2971",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2971",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
index 30d5e128f5..436e7f9cc7 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2971",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2971",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata_SimpleTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
@@ -71,14 +71,14 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2971",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2971",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
index 68b3ef411b..0b1c87c4bd 100644
--- a/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Bugs2971NullableTypeTest.Test.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2971",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2971",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata_SimpleTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
@@ -71,14 +71,14 @@ internal static class TUnit_TestProject_Bugs__2971_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2971.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2971",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2971.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2971.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2971",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2971.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2971.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
index af00e44a53..dcb1324e2f 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-        Name = "ClassAndMethodArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "arg1",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+            Name = "ClassAndMethodArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "arg1",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
         var metadata_Simple = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
@@ -203,23 +203,23 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-        Name = "ClassAndMethodArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "arg1",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+            Name = "ClassAndMethodArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "arg1",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
@@ -239,23 +239,23 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-        Name = "ClassAndMethodArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "arg1",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+            Name = "ClassAndMethodArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "arg1",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
@@ -289,23 +289,23 @@ internal static class TUnit_TestProject_ClassAndMethodArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassAndMethodArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
-        Name = "ClassAndMethodArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "arg1",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests)),
+            Name = "ClassAndMethodArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "arg1",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests).GetConstructor(new global::System.Type[] { typeof(string) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassAndMethodArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassAndMethodArgumentsTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
index 6a12b14797..6bacd0f28c 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassConstructorTest.Test.verified.txt
@@ -11,36 +11,36 @@ internal static class TUnit_TestProject_ClassConstructorTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassConstructorTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
-        Name = "ClassConstructorTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
-        {
-        Name = "dummyReferenceTypeClass",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
-        }
-        },
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
-        Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
-        Name = "DummyReferenceTypeClass",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
+            Name = "ClassConstructorTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
+                {
+                    Name = "dummyReferenceTypeClass",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
+                }
+            },
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
+                    Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
+                    Name = "DummyReferenceTypeClass",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassConstructorTest);
         var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassConstructorTest>(
@@ -93,36 +93,36 @@ internal static class TUnit_TestProject_ClassConstructorTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassConstructorTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
-        Name = "ClassConstructorTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
-        {
-        Name = "dummyReferenceTypeClass",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
-        }
-        },
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
-        Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
-        Name = "DummyReferenceTypeClass",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassConstructorTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassConstructorTest)),
+            Name = "ClassConstructorTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.DummyReferenceTypeClass))
+                {
+                    Name = "dummyReferenceTypeClass",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DummyReferenceTypeClass)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.DummyReferenceTypeClass) })!.GetParameters()[0]
+                }
+            },
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassConstructorTest).GetProperty("DummyReferenceTypeClass"),
+                    Type = typeof(global::TUnit.TestProject.DummyReferenceTypeClass),
+                    Name = "DummyReferenceTypeClass",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassConstructorTest)o).DummyReferenceTypeClass,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassConstructorTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassConstructorTest>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
index 8e062c65c1..5d7f489e5a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-        Name = "ClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+            Name = "ClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata_DataSource_Class__SomeAsyncDisposableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -481,14 +481,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-        Name = "ClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+            Name = "ClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -516,14 +516,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-        Name = "ClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+            Name = "ClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -551,14 +551,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-        Name = "ClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+            Name = "ClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -586,14 +586,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-        Name = "ClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+            Name = "ClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -628,14 +628,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-        Name = "ClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+            Name = "ClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -677,14 +677,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-        Name = "ClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+            Name = "ClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
@@ -733,14 +733,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
-        Name = "ClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests)),
+            Name = "ClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
index 6349380627..4b83bba8c5 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests2.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-        Name = "ClassDataSourceDrivenTests2",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
-        {
-        Name = "base",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
+            Name = "ClassDataSourceDrivenTests2",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
+                {
+                    Name = "base",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2);
         var metadata_Base_Derived1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
@@ -125,23 +125,23 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-        Name = "ClassDataSourceDrivenTests2",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
-        {
-        Name = "base",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
+            Name = "ClassDataSourceDrivenTests2",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
+                {
+                    Name = "base",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
@@ -161,23 +161,23 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTests2__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTests2", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
-        Name = "ClassDataSourceDrivenTests2",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
-        {
-        Name = "base",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2)),
+            Name = "ClassDataSourceDrivenTests2",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base))
+                {
+                    Name = "base",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2.Base) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTests2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTests2>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
index 20103c63bd..389d8f2a83 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-        Name = "ClassDataSourceDrivenTestsSharedKeyed",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
+            Name = "ClassDataSourceDrivenTestsSharedKeyed",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed);
         var metadata_DataSource_Class__SomeAsyncDisposableClass = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
@@ -148,14 +148,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-        Name = "ClassDataSourceDrivenTestsSharedKeyed",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
+            Name = "ClassDataSourceDrivenTestsSharedKeyed",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
@@ -184,14 +184,14 @@ internal static class TUnit_TestProject_ClassDataSourceDrivenTestsSharedKeyed__T
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
-        Name = "ClassDataSourceDrivenTestsSharedKeyed",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed)),
+            Name = "ClassDataSourceDrivenTestsSharedKeyed",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassDataSourceDrivenTestsSharedKeyed>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
index 7bfc44287f..87e5d86515 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
@@ -21,83 +21,83 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
-        Name = "ClassTupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "value2",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-        {
-        Name = "value3",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-        }
-        },
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
-        Type = typeof(global::System.ValueTuple<int, string, bool>),
-        Name = "Property1",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
-        Type = typeof(global::System.ValueTuple<int, string, bool>),
-        Name = "Property2",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
-        Type = typeof(global::System.ValueTuple<int, string, bool>),
-        Name = "Property3",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
-        Type = typeof(global::System.ValueTuple<int, string, bool>),
-        Name = "Property4",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
+            Name = "ClassTupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "value2",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                {
+                    Name = "value3",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+                }
+            },
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
+                    Type = typeof(global::System.ValueTuple<int, string, bool>),
+                    Name = "Property1",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
+                    Type = typeof(global::System.ValueTuple<int, string, bool>),
+                    Name = "Property2",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
+                    Type = typeof(global::System.ValueTuple<int, string, bool>),
+                    Name = "Property3",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
+                    Type = typeof(global::System.ValueTuple<int, string, bool>),
+                    Name = "Property4",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests);
         var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassTupleDataSourceDrivenTests>(
@@ -375,83 +375,83 @@ internal static class TUnit_TestProject_ClassTupleDataSourceDrivenTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ClassTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
-        Name = "ClassTupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "value2",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-        {
-        Name = "value3",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-        }
-        },
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
-        Type = typeof(global::System.ValueTuple<int, string, bool>),
-        Name = "Property1",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
-        Type = typeof(global::System.ValueTuple<int, string, bool>),
-        Name = "Property2",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
-        Type = typeof(global::System.ValueTuple<int, string, bool>),
-        Name = "Property3",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
-        Type = typeof(global::System.ValueTuple<int, string, bool>),
-        Name = "Property4",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)),
+            Name = "ClassTupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "value2",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                {
+                    Name = "value3",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+                }
+            },
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property1"),
+                    Type = typeof(global::System.ValueTuple<int, string, bool>),
+                    Name = "Property1",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property1,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property2"),
+                    Type = typeof(global::System.ValueTuple<int, string, bool>),
+                    Name = "Property2",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property2,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property3"),
+                    Type = typeof(global::System.ValueTuple<int, string, bool>),
+                    Name = "Property3",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property3,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests).GetProperty("Property4"),
+                    Type = typeof(global::System.ValueTuple<int, string, bool>),
+                    Name = "Property4",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.ClassTupleDataSourceDrivenTests)o).Property4,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ClassTupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ClassTupleDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
index 600562fc22..6293a6d7dc 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConcreteClassTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-        Name = "ConcreteClass2",
-        Namespace = "TUnit.TestProject.AbstractTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+            Name = "ConcreteClass2",
+            Namespace = "TUnit.TestProject.AbstractTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
         var metadata_SecondTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
@@ -72,14 +72,14 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-        Name = "ConcreteClass2",
-        Namespace = "TUnit.TestProject.AbstractTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+            Name = "ConcreteClass2",
+            Namespace = "TUnit.TestProject.AbstractTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
index 83d3587481..3a7445c2f0 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.BasicTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
index f8fb09ebb1..fcd8203523 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -593,14 +593,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -630,14 +630,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -674,14 +674,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -711,14 +711,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -746,14 +746,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -781,14 +781,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -816,14 +816,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -853,14 +853,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -888,14 +888,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -923,14 +923,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
index f8fb09ebb1..fcd8203523 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -593,14 +593,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -630,14 +630,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -674,14 +674,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -711,14 +711,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -746,14 +746,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -781,14 +781,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -816,14 +816,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -853,14 +853,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -888,14 +888,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -923,14 +923,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
index f8fb09ebb1..fcd8203523 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -593,14 +593,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -630,14 +630,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -674,14 +674,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -711,14 +711,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -746,14 +746,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -781,14 +781,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -816,14 +816,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -853,14 +853,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -888,14 +888,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -923,14 +923,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
index 4259b2d20f..b42d6da9df 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.DataDrivenTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -593,14 +593,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -630,14 +630,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -674,14 +674,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -711,14 +711,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -746,14 +746,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -781,14 +781,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -816,14 +816,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -853,14 +853,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -888,14 +888,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -923,14 +923,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
index e3130fa2a0..3e06f93c7c 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -829,14 +829,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -878,14 +878,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -934,14 +934,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -983,14 +983,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1025,14 +1025,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1067,14 +1067,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1109,14 +1109,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1151,14 +1151,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1186,14 +1186,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1221,14 +1221,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1256,14 +1256,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1291,14 +1291,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1333,14 +1333,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
index e3130fa2a0..3e06f93c7c 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -829,14 +829,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -878,14 +878,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -934,14 +934,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -983,14 +983,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1025,14 +1025,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1067,14 +1067,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1109,14 +1109,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1151,14 +1151,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1186,14 +1186,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1221,14 +1221,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1256,14 +1256,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1291,14 +1291,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1333,14 +1333,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
index e3130fa2a0..3e06f93c7c 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -829,14 +829,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -878,14 +878,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -934,14 +934,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -983,14 +983,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1025,14 +1025,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1067,14 +1067,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1109,14 +1109,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1151,14 +1151,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1186,14 +1186,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1221,14 +1221,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1256,14 +1256,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1291,14 +1291,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1333,14 +1333,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
index ec46fcfc8a..aeb246a893 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MatrixTest_WithConflictingNamespace.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -829,14 +829,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -878,14 +878,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -934,14 +934,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -983,14 +983,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1025,14 +1025,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1067,14 +1067,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1109,14 +1109,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1151,14 +1151,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1186,14 +1186,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1221,14 +1221,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1256,14 +1256,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1291,14 +1291,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1333,14 +1333,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
index e681fd32f2..e804e7ff76 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -559,14 +559,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -605,14 +605,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -651,14 +651,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -697,14 +697,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -758,14 +758,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -846,14 +846,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -892,14 +892,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
index e681fd32f2..e804e7ff76 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -559,14 +559,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -605,14 +605,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -651,14 +651,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -697,14 +697,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -758,14 +758,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -846,14 +846,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -892,14 +892,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
index e681fd32f2..e804e7ff76 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -559,14 +559,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -605,14 +605,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -651,14 +651,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -697,14 +697,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -758,14 +758,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -846,14 +846,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -892,14 +892,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
index da0e86c598..d899ae21b3 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.MethodDataSource_WithConflictingNamespace.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -559,14 +559,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -605,14 +605,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -651,14 +651,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -697,14 +697,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -758,14 +758,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -846,14 +846,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -892,14 +892,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
index 9eef351dd2..9b607177a9 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
@@ -117,14 +117,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
index 9eef351dd2..9b607177a9 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
@@ -117,14 +117,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
index 9eef351dd2..9b607177a9 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
@@ -117,14 +117,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
index d52363f53a..d72f6ffac0 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConflictingNamespaceTests.TupleDataSource_WithConflictingNamespace.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
@@ -117,14 +117,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
index 1c88a08ce3..295406b53f 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-        Name = "ConstantArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+            Name = "ConstantArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata_String1__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -409,14 +409,14 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-        Name = "ConstantArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+            Name = "ConstantArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -444,14 +444,14 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-        Name = "ConstantArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+            Name = "ConstantArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -479,14 +479,14 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-        Name = "ConstantArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+            Name = "ConstantArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -514,14 +514,14 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-        Name = "ConstantArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+            Name = "ConstantArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -549,14 +549,14 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-        Name = "ConstantArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+            Name = "ConstantArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -584,14 +584,14 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-        Name = "ConstantArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+            Name = "ConstantArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
@@ -619,14 +619,14 @@ internal static class TUnit_TestProject_ConstantArgumentsTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ConstantArgumentsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
-        Name = "ConstantArgumentsTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConstantArgumentsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConstantArgumentsTests)),
+            Name = "ConstantArgumentsTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConstantArgumentsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConstantArgumentsTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
index adade6e383..30afc072be 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantInBaseClassTests__Tes
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
-        Name = "ConstantInBaseClassTests",
-        Namespace = "TUnit.TestProject.Bugs._1432",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
+            Name = "ConstantInBaseClassTests",
+            Namespace = "TUnit.TestProject.Bugs._1432",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests);
         var metadata_SomeTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests>(
@@ -91,14 +91,14 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantInBaseClassTests__Tes
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
-        Name = "ConstantInBaseClassTests",
-        Namespace = "TUnit.TestProject.Bugs._1432",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests)),
+            Name = "ConstantInBaseClassTests",
+            Namespace = "TUnit.TestProject.Bugs._1432",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantInBaseClassTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
index 37fd47c858..0712e9d303 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantsInInterpolatedString
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
-        Name = "ConstantsInInterpolatedStringsTests",
-        Namespace = "TUnit.TestProject.Bugs._1432",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
+            Name = "ConstantsInInterpolatedStringsTests",
+            Namespace = "TUnit.TestProject.Bugs._1432",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests);
         var metadata_SomeTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests>(
@@ -91,14 +91,14 @@ internal static class TUnit_TestProject_Bugs__1432_ConstantsInInterpolatedString
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
-        Name = "ConstantsInInterpolatedStringsTests",
-        Namespace = "TUnit.TestProject.Bugs._1432",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests)),
+            Name = "ConstantsInInterpolatedStringsTests",
+            Namespace = "TUnit.TestProject.Bugs._1432",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.ConstantsInInterpolatedStringsTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
index c07fb84c93..728e785ad7 100644
--- a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
@@ -11,27 +11,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -512,27 +512,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -547,27 +547,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -582,27 +582,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -645,27 +645,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -704,27 +704,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -761,27 +761,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -809,27 +809,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -844,27 +844,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
@@ -879,27 +879,27 @@ internal static class TUnit_TestProject_CustomDisplayNameTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CustomDisplayNameTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
-        Name = "CustomDisplayNameTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
-        Type = typeof(int),
-        Name = "Order",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CustomDisplayNameTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CustomDisplayNameTests)),
+            Name = "CustomDisplayNameTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CustomDisplayNameTests).GetProperty("Order"),
+                    Type = typeof(int),
+                    Name = "Order",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.CustomDisplayNameTests)o).Order,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CustomDisplayNameTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CustomDisplayNameTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
index 4259b2d20f..b42d6da9df 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -593,14 +593,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -630,14 +630,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -674,14 +674,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -711,14 +711,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -746,14 +746,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -781,14 +781,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -816,14 +816,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -853,14 +853,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -888,14 +888,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
@@ -923,14 +923,14 @@ internal static class TUnit_TestProject_DataDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
-        Name = "DataDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataDrivenTests)),
+            Name = "DataDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
index 1a71799592..11a6c6eaa6 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_DataSourceClassCombinedWithDataSourceMet
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
-        Name = "DataSourceClassCombinedWithDataSourceMethod",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "i",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
+            Name = "DataSourceClassCombinedWithDataSourceMethod",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "i",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod);
         var metadata_DataSourceClassCombinedWithDataSourceMethodTest__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod>(
@@ -178,23 +178,23 @@ internal static class TUnit_TestProject_DataSourceClassCombinedWithDataSourceMet
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
-        Name = "DataSourceClassCombinedWithDataSourceMethod",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "i",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod)),
+            Name = "DataSourceClassCombinedWithDataSourceMethod",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "i",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceClassCombinedWithDataSourceMethod>(
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
index a118a0d840..1d7ada552d 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
@@ -11,37 +11,37 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-        Name = "DataSourceGeneratorTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "value2",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-        {
-        Name = "value3",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+            Name = "DataSourceGeneratorTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "value2",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                {
+                    Name = "value3",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
         var metadata_GeneratedData_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
@@ -268,37 +268,37 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-        Name = "DataSourceGeneratorTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "value2",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-        {
-        Name = "value3",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+            Name = "DataSourceGeneratorTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "value2",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                {
+                    Name = "value3",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
@@ -331,37 +331,37 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-        Name = "DataSourceGeneratorTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "value2",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-        {
-        Name = "value3",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+            Name = "DataSourceGeneratorTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "value2",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                {
+                    Name = "value3",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
@@ -408,37 +408,37 @@ internal static class TUnit_TestProject_DataSourceGeneratorTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DataSourceGeneratorTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
-        Name = "DataSourceGeneratorTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(string))
-        {
-        Name = "value2",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(bool))
-        {
-        Name = "value3",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DataSourceGeneratorTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DataSourceGeneratorTests)),
+            Name = "DataSourceGeneratorTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[0]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(string))
+                {
+                    Name = "value2",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(string)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[1]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(bool))
+                {
+                    Name = "value3",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(bool)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.DataSourceGeneratorTests).GetConstructor(new global::System.Type[] { typeof(int), typeof(string), typeof(bool) })!.GetParameters()[2]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DataSourceGeneratorTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DataSourceGeneratorTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
index 9e58d7b7e1..2a66f22353 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AutoDataTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AutoDataTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AutoDataTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
-        Name = "AutoDataTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AutoDataTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
+            Name = "AutoDataTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AutoDataTests);
         var metadata_Test1__string_int_double_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AutoDataTests>(
@@ -111,14 +111,14 @@ internal static class TUnit_TestProject_AutoDataTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AutoDataTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AutoDataTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
-        Name = "AutoDataTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AutoDataTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AutoDataTests)),
+            Name = "AutoDataTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AutoDataTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AutoDataTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
index d30748d4da..23ba9138a3 100644
--- a/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DecimalArgumentTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata_Transfer__decimal_decimal = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -738,14 +738,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -782,14 +782,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -817,14 +817,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -852,14 +852,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -887,14 +887,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -922,14 +922,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -957,14 +957,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -1006,14 +1006,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -1043,14 +1043,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -1115,14 +1115,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -1150,14 +1150,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
@@ -1185,14 +1185,14 @@ internal static class TUnit_TestProject_DecimalArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.DecimalArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
-        Name = "DecimalArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.DecimalArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.DecimalArgumentTests)),
+            Name = "DecimalArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.DecimalArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.DecimalArgumentTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
index b57e7abfd5..0c1800331e 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
index 83d3587481..3a7445c2f0 100644
--- a/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DisableReflectionScannerTests.Test.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata_SynchronousTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -134,14 +134,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -156,14 +156,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
@@ -178,14 +178,14 @@ internal static class TUnit_TestProject_BasicTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.BasicTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.BasicTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
-        Name = "BasicTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.BasicTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.BasicTests)),
+            Name = "BasicTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.BasicTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.BasicTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
index ad6094adc4..daf72561fb 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__1432_EnumMemberNamesTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
-        Name = "EnumMemberNamesTests",
-        Namespace = "TUnit.TestProject.Bugs._1432",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
+            Name = "EnumMemberNamesTests",
+            Namespace = "TUnit.TestProject.Bugs._1432",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests);
         var metadata_SomeTest__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests>(
@@ -94,14 +94,14 @@ internal static class TUnit_TestProject_Bugs__1432_EnumMemberNamesTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
-        Name = "EnumMemberNamesTests",
-        Namespace = "TUnit.TestProject.Bugs._1432",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests)),
+            Name = "EnumMemberNamesTests",
+            Namespace = "TUnit.TestProject.Bugs._1432",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1432.EnumMemberNamesTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
index 04c8932fc5..945b792654 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-        Name = "EnumerableDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+            Name = "EnumerableDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
@@ -261,14 +261,14 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-        Name = "EnumerableDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+            Name = "EnumerableDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
@@ -317,14 +317,14 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-        Name = "EnumerableDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+            Name = "EnumerableDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
@@ -373,14 +373,14 @@ internal static class TUnit_TestProject_EnumerableDataSourceDrivenTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
-        Name = "EnumerableDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests)),
+            Name = "EnumerableDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.EnumerableDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
index 97f9b44328..aee216476a 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_EnumerableTupleDataSourceDrivenTests__Te
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
-        Name = "EnumerableTupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
+            Name = "EnumerableTupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests);
         var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests>(
@@ -149,14 +149,14 @@ internal static class TUnit_TestProject_EnumerableTupleDataSourceDrivenTests__Te
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
-        Name = "EnumerableTupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests)),
+            Name = "EnumerableTupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.EnumerableTupleDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
index 3ef4c96f48..faefd13030 100644
--- a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-        Name = "ExpectedArgumentTypeTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
+            Name = "ExpectedArgumentTypeTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests);
         var metadata_TypedArguments__object_Type = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
@@ -184,14 +184,14 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-        Name = "ExpectedArgumentTypeTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
+            Name = "ExpectedArgumentTypeTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
@@ -238,14 +238,14 @@ internal static class TUnit_TestProject_ExpectedArgumentTypeTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ExpectedArgumentTypeTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
-        Name = "ExpectedArgumentTypeTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests)),
+            Name = "ExpectedArgumentTypeTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ExpectedArgumentTypeTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ExpectedArgumentTypeTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
index 9203ca228d..ebbb842b25 100644
--- a/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/GenericTypeResolverTests.Test_EmptyGenericRegistry_WhenNoGenericsFound.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_SimpleTestClass__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("GenericTypeResolverTests:global::TUnit.TestProject.SimpleTestClass", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.SimpleTestClass),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
-        Name = "SimpleTestClass",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.SimpleTestClass),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
+            Name = "SimpleTestClass",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.SimpleTestClass);
         var metadata_NonGenericTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.SimpleTestClass>(
@@ -70,14 +70,14 @@ internal static class TUnit_TestProject_SimpleTestClass__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("GenericTypeResolverTests:global::TUnit.TestProject.SimpleTestClass", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.SimpleTestClass),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
-        Name = "SimpleTestClass",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.SimpleTestClass),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.SimpleTestClass)),
+            Name = "SimpleTestClass",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("GenericTypeResolverTests", "GenericTypeResolverTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.SimpleTestClass);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.SimpleTestClass>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
index 0573435a3d..35ab63160d 100644
--- a/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Hooks1589.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-        Name = "MyTests",
-        Namespace = "TUnit.TestProject.Bugs._1589",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-        {
-        Name = "myFixture",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+            Name = "MyTests",
+            Namespace = "TUnit.TestProject.Bugs._1589",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+                {
+                    Name = "myFixture",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
@@ -86,23 +86,23 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-        Name = "MyTests",
-        Namespace = "TUnit.TestProject.Bugs._1589",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-        {
-        Name = "myFixture",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+            Name = "MyTests",
+            Namespace = "TUnit.TestProject.Bugs._1589",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+                {
+                    Name = "myFixture",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
index b0617094f7..0efcd97213 100644
--- a/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Hooks1594.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-        Name = "MyTests",
-        Namespace = "TUnit.TestProject.Bugs._1594",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-        {
-        Name = "myFixture",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+            Name = "MyTests",
+            Namespace = "TUnit.TestProject.Bugs._1594",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+                {
+                    Name = "myFixture",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
@@ -87,23 +87,23 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-        Name = "MyTests",
-        Namespace = "TUnit.TestProject.Bugs._1594",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-        {
-        Name = "myFixture",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+            Name = "MyTests",
+            Namespace = "TUnit.TestProject.Bugs._1594",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+                {
+                    Name = "myFixture",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
index 76b1b57dfb..1e07c9b7a2 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritedPropertySetterTests.Test.verified.txt
@@ -25,104 +25,104 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-        Name = "PropertySetterTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-        Type = typeof(string),
-        Name = "Property1",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-        Type = typeof(string),
-        Name = "Property2",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property3",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property4",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property5",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property6",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-        Type = typeof(string),
-        Name = "Property7",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-        Name = "StaticProperty",
-        IsStatic = true,
-        IsNullable = false,
-        Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+            Name = "PropertySetterTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+                    Type = typeof(string),
+                    Name = "Property1",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+                    Type = typeof(string),
+                    Name = "Property2",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property3",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property4",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property5",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property6",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+                    Type = typeof(string),
+                    Name = "Property7",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+                    Name = "StaticProperty",
+                    IsStatic = true,
+                    IsNullable = false,
+                    Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
         var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
@@ -327,104 +327,104 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-        Name = "PropertySetterTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-        Type = typeof(string),
-        Name = "Property1",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-        Type = typeof(string),
-        Name = "Property2",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property3",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property4",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property5",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property6",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-        Type = typeof(string),
-        Name = "Property7",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-        Name = "StaticProperty",
-        IsStatic = true,
-        IsNullable = false,
-        Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+            Name = "PropertySetterTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+                    Type = typeof(string),
+                    Name = "Property1",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+                    Type = typeof(string),
+                    Name = "Property2",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property3",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property4",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property5",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property6",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+                    Type = typeof(string),
+                    Name = "Property7",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+                    Name = "StaticProperty",
+                    IsStatic = true,
+                    IsNullable = false,
+                    Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
index 19e4f8940c..3fb50d1c5f 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-        Name = "InheritedTestsFromDifferentProjectTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+            Name = "InheritedTestsFromDifferentProjectTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
         var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
@@ -224,14 +224,14 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-        Name = "InheritedTestsFromDifferentProjectTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+            Name = "InheritedTestsFromDifferentProjectTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
@@ -246,14 +246,14 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-        Name = "InheritedTestsFromDifferentProjectTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+            Name = "InheritedTestsFromDifferentProjectTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
@@ -281,14 +281,14 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-        Name = "InheritedTestsFromDifferentProjectTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+            Name = "InheritedTestsFromDifferentProjectTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
@@ -327,14 +327,14 @@ internal static class TUnit_TestProject_InheritedTestsFromDifferentProjectTests_
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
-        Name = "InheritedTestsFromDifferentProjectTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests)),
+            Name = "InheritedTestsFromDifferentProjectTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.InheritedTestsFromDifferentProjectTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
index 600562fc22..6293a6d7dc 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritsTestsAbstractTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-        Name = "ConcreteClass2",
-        Namespace = "TUnit.TestProject.AbstractTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+            Name = "ConcreteClass2",
+            Namespace = "TUnit.TestProject.AbstractTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
         var metadata_SecondTest = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
@@ -72,14 +72,14 @@ internal static class TUnit_TestProject_AbstractTests_ConcreteClass2__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
-        Name = "ConcreteClass2",
-        Namespace = "TUnit.TestProject.AbstractTests",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
+            Name = "ConcreteClass2",
+            Namespace = "TUnit.TestProject.AbstractTests",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AbstractTests.ConcreteClass2>(
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
index b06387f621..e731ecf998 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
@@ -15,27 +15,27 @@ internal static class TUnit_TestProject_Bugs__1924_None_BaseClass__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1924.None.BaseClass", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
-        Name = "BaseClass",
-        Namespace = "TUnit.TestProject.Bugs._1924.None",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
-        Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-        Name = "Data",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
+            Name = "BaseClass",
+            Namespace = "TUnit.TestProject.Bugs._1924.None",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
+                    Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+                    Name = "Data",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass);
         var metadata_Test__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1924.None.BaseClass>(
@@ -140,27 +140,27 @@ internal static class TUnit_TestProject_Bugs__1924_None_BaseClass__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1924.None.BaseClass", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
-        Name = "BaseClass",
-        Namespace = "TUnit.TestProject.Bugs._1924.None",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
-        Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
-        Name = "Data",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass)),
+            Name = "BaseClass",
+            Namespace = "TUnit.TestProject.Bugs._1924.None",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass).GetProperty("Data"),
+                    Type = typeof(global::TUnit.TestProject.Bugs._1924.DataClass),
+                    Name = "Data",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.Bugs._1924.None.BaseClass)o).Data,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1924.None.BaseClass);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1924.None.BaseClass>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
index 1057f45812..ff4abc7ec2 100644
--- a/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Issue2887Tests.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_Bugs__Issue2887_ActualTestClass__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
-        Name = "ActualTestClass",
-        Namespace = "TUnit.TestProject.Bugs._Issue2887",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
-        {
-        Name = "serviceProvider",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
+            Name = "ActualTestClass",
+            Namespace = "TUnit.TestProject.Bugs._Issue2887",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
+                {
+                    Name = "serviceProvider",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass>(
@@ -80,23 +80,23 @@ internal static class TUnit_TestProject_Bugs__Issue2887_ActualTestClass__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
-        Name = "ActualTestClass",
-        Namespace = "TUnit.TestProject.Bugs._Issue2887",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
-        {
-        Name = "serviceProvider",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass)),
+            Name = "ActualTestClass",
+            Namespace = "TUnit.TestProject.Bugs._Issue2887",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider))
+                {
+                    Name = "serviceProvider",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._Issue2887.IServiceProvider) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._Issue2887.ActualTestClass>(
diff --git a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
index bbdd905702..d703fb53b5 100644
--- a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata_MatrixTest_One__string_int_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -829,14 +829,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -878,14 +878,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -934,14 +934,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -983,14 +983,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1025,14 +1025,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1067,14 +1067,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1109,14 +1109,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1151,14 +1151,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1186,14 +1186,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1221,14 +1221,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1256,14 +1256,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1291,14 +1291,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
@@ -1333,14 +1333,14 @@ internal static class TUnit_TestProject_MatrixTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MatrixTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MatrixTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
-        Name = "MatrixTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MatrixTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MatrixTests)),
+            Name = "MatrixTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MatrixTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MatrixTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
index da0e86c598..d899ae21b3 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata_DataSource_Method__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -559,14 +559,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -605,14 +605,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -651,14 +651,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -697,14 +697,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -758,14 +758,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -846,14 +846,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
@@ -892,14 +892,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
-        Name = "MethodDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests)),
+            Name = "MethodDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
index a49d2da617..9dfb0e0444 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenWithCancellationTo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
-        Name = "MethodDataSourceDrivenWithCancellationTokenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
+            Name = "MethodDataSourceDrivenWithCancellationTokenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests);
         var metadata_MyTest__int_CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests>(
@@ -212,14 +212,14 @@ internal static class TUnit_TestProject_MethodDataSourceDrivenWithCancellationTo
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
-        Name = "MethodDataSourceDrivenWithCancellationTokenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests)),
+            Name = "MethodDataSourceDrivenWithCancellationTokenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MethodDataSourceDrivenWithCancellationTokenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
index 8610dae092..4ecf8f690f 100644
--- a/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MultipleClassDataSourceDrivenTests.Test.verified.txt
@@ -11,51 +11,51 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-        Name = "MultipleClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
-        {
-        Name = "inject1",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
-        {
-        Name = "inject2",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
-        {
-        Name = "inject3",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
-        {
-        Name = "inject4",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
-        {
-        Name = "inject5",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
+            Name = "MultipleClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
+                {
+                    Name = "inject1",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
+                {
+                    Name = "inject2",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
+                {
+                    Name = "inject3",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
+                {
+                    Name = "inject4",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
+                {
+                    Name = "inject5",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
@@ -153,51 +153,51 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-        Name = "MultipleClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
-        {
-        Name = "inject1",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
-        {
-        Name = "inject2",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
-        {
-        Name = "inject3",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
-        {
-        Name = "inject4",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
-        {
-        Name = "inject5",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
+            Name = "MultipleClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
+                {
+                    Name = "inject1",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
+                {
+                    Name = "inject2",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
+                {
+                    Name = "inject3",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
+                {
+                    Name = "inject4",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
+                {
+                    Name = "inject5",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
@@ -217,51 +217,51 @@ internal static class TUnit_TestProject_MultipleClassDataSourceDrivenTests__Test
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.MultipleClassDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
-        Name = "MultipleClassDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
-        {
-        Name = "inject1",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
-        {
-        Name = "inject2",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
-        {
-        Name = "inject3",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
-        {
-        Name = "inject4",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
-        },
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
-        {
-        Name = "inject5",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests)),
+            Name = "MultipleClassDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1))
+                {
+                    Name = "inject1",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[0]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2))
+                {
+                    Name = "inject2",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[1]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3))
+                {
+                    Name = "inject3",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[2]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4))
+                {
+                    Name = "inject4",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[3]
+                },
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5))
+                {
+                    Name = "inject5",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject1), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject2), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject3), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject4), typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests.Inject5) })!.GetParameters()[4]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.MultipleClassDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.MultipleClassDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
index 97dc084b0e..5e1d18a5db 100644
--- a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_NameOfArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NameOfArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
-        Name = "NameOfArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
+            Name = "NameOfArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NameOfArgumentTests);
         var metadata_TestName__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NameOfArgumentTests>(
@@ -91,14 +91,14 @@ internal static class TUnit_TestProject_NameOfArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NameOfArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
-        Name = "NameOfArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NameOfArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NameOfArgumentTests)),
+            Name = "NameOfArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NameOfArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NameOfArgumentTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
index 46a4e26965..765fbf9031 100644
--- a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-        Name = "NullableByteArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
+            Name = "NullableByteArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NullableByteArgumentTests);
         var metadata_Test__byte_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
@@ -155,14 +155,14 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-        Name = "NullableByteArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
+            Name = "NullableByteArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NullableByteArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
@@ -191,14 +191,14 @@ internal static class TUnit_TestProject_NullableByteArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NullableByteArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
-        Name = "NullableByteArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NullableByteArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NullableByteArgumentTests)),
+            Name = "NullableByteArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NullableByteArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NullableByteArgumentTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
index 31e04365bb..04fcbe2fc8 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata_Int__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -362,14 +362,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -397,14 +397,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -432,14 +432,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -467,14 +467,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -502,14 +502,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -537,14 +537,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
index 31e04365bb..04fcbe2fc8 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata_Int__int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -362,14 +362,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -397,14 +397,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -432,14 +432,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -467,14 +467,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -502,14 +502,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
@@ -537,14 +537,14 @@ internal static class TUnit_TestProject_NumberArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.NumberArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
-        Name = "NumberArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.NumberArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.NumberArgumentTests)),
+            Name = "NumberArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.NumberArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.NumberArgumentTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
index 4893920bd7..b49cf57f47 100644
--- a/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/PriorityFilteringTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-        Name = "PriorityFilteringTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+            Name = "PriorityFilteringTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata_High_1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
@@ -246,14 +246,14 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-        Name = "PriorityFilteringTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+            Name = "PriorityFilteringTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
@@ -268,14 +268,14 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-        Name = "PriorityFilteringTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+            Name = "PriorityFilteringTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
@@ -290,14 +290,14 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-        Name = "PriorityFilteringTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+            Name = "PriorityFilteringTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
@@ -312,14 +312,14 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-        Name = "PriorityFilteringTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+            Name = "PriorityFilteringTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
@@ -334,14 +334,14 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-        Name = "PriorityFilteringTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+            Name = "PriorityFilteringTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
@@ -356,14 +356,14 @@ internal static class TUnit_TestProject_PriorityFilteringTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PriorityFilteringTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
-        Name = "PriorityFilteringTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PriorityFilteringTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PriorityFilteringTests)),
+            Name = "PriorityFilteringTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PriorityFilteringTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PriorityFilteringTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
index 5ed46bd67c..3af193f43a 100644
--- a/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/PropertySetterTests.Test.verified.txt
@@ -25,104 +25,104 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-        Name = "PropertySetterTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-        Type = typeof(string),
-        Name = "Property1",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-        Type = typeof(string),
-        Name = "Property2",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property3",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property4",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property5",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property6",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-        Type = typeof(string),
-        Name = "Property7",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-        Name = "StaticProperty",
-        IsStatic = true,
-        IsNullable = false,
-        Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+            Name = "PropertySetterTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+                    Type = typeof(string),
+                    Name = "Property1",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+                    Type = typeof(string),
+                    Name = "Property2",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property3",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property4",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property5",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property6",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+                    Type = typeof(string),
+                    Name = "Property7",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+                    Name = "StaticProperty",
+                    IsStatic = true,
+                    IsNullable = false,
+                    Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
         var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
@@ -327,104 +327,104 @@ internal static class TUnit_TestProject_PropertySetterTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.PropertySetterTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
-        Name = "PropertySetterTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = new global::TUnit.Core.PropertyMetadata[]
-        {
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
-        Type = typeof(string),
-        Name = "Property1",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
-        Type = typeof(string),
-        Name = "Property2",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property3",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property4",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property5",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
-        Name = "Property6",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
-        Type = typeof(string),
-        Name = "Property7",
-        IsStatic = false,
-        IsNullable = false,
-        Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        },
-        new global::TUnit.Core.PropertyMetadata
-        {
-        ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
-        Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
-        Name = "StaticProperty",
-        IsStatic = true,
-        IsNullable = false,
-        Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
-        ClassMetadata = null!,
-        ContainingTypeMetadata = null!
-        }
-        },
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.PropertySetterTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.PropertySetterTests)),
+            Name = "PropertySetterTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = new global::TUnit.Core.PropertyMetadata[]
+            {
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property1"),
+                    Type = typeof(string),
+                    Name = "Property1",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property1,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property2"),
+                    Type = typeof(string),
+                    Name = "Property2",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property2,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property3"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property3",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property3,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property4"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property4",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property4,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property5"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property5",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property5,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property6"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.InnerModel),
+                    Name = "Property6",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property6,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("Property7"),
+                    Type = typeof(string),
+                    Name = "Property7",
+                    IsStatic = false,
+                    IsNullable = false,
+                    Getter = o => ((global::TUnit.TestProject.PropertySetterTests)o).Property7,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                },
+                new global::TUnit.Core.PropertyMetadata
+                {
+                    ReflectionInfo = typeof(global::TUnit.TestProject.PropertySetterTests).GetProperty("StaticProperty"),
+                    Type = typeof(global::TUnit.TestProject.PropertySetterTests.StaticInnerModel),
+                    Name = "StaticProperty",
+                    IsStatic = true,
+                    IsNullable = false,
+                    Getter = _ => global::TUnit.TestProject.PropertySetterTests.StaticProperty,
+                    ClassMetadata = null!,
+                    ContainingTypeMetadata = null!
+                }
+            },
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.PropertySetterTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.PropertySetterTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
index 45ef4a351f..5937c75008 100644
--- a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Assembly_Level_Repeat.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-        Name = "AssemblyRepeatTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
+            Name = "AssemblyRepeatTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AssemblyRepeatTests);
         var metadata_TestWithAssemblyRepeat = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
@@ -115,14 +115,14 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-        Name = "AssemblyRepeatTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
+            Name = "AssemblyRepeatTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AssemblyRepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
@@ -138,14 +138,14 @@ internal static class TUnit_TestProject_AssemblyRepeatTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AssemblyRepeatTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
-        Name = "AssemblyRepeatTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AssemblyRepeatTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AssemblyRepeatTests)),
+            Name = "AssemblyRepeatTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AssemblyRepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AssemblyRepeatTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
index 44401144b4..9640c8ec50 100644
--- a/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/RepeatTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.RepeatTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-        Name = "RepeatTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.RepeatTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+            Name = "RepeatTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.RepeatTests);
         var metadata_One = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
@@ -161,14 +161,14 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.RepeatTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-        Name = "RepeatTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.RepeatTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+            Name = "RepeatTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.RepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
@@ -184,14 +184,14 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.RepeatTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-        Name = "RepeatTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.RepeatTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+            Name = "RepeatTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.RepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
@@ -207,14 +207,14 @@ internal static class TUnit_TestProject_RepeatTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.RepeatTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.RepeatTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
-        Name = "RepeatTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.RepeatTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.RepeatTests)),
+            Name = "RepeatTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.RepeatTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.RepeatTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
index 29ba021cac..8eea0fef29 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet10_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata_With_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -548,14 +548,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -571,14 +571,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -594,14 +594,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -617,14 +617,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -640,14 +640,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -663,14 +663,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -686,14 +686,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -709,14 +709,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -732,14 +732,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -755,14 +755,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -778,14 +778,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -801,14 +801,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -824,14 +824,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -847,14 +847,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -870,14 +870,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
index 29ba021cac..8eea0fef29 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet8_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata_With_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -548,14 +548,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -571,14 +571,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -594,14 +594,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -617,14 +617,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -640,14 +640,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -663,14 +663,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -686,14 +686,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -709,14 +709,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -732,14 +732,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -755,14 +755,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -778,14 +778,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -801,14 +801,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -824,14 +824,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -847,14 +847,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -870,14 +870,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
index 29ba021cac..8eea0fef29 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.DotNet9_0.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata_With_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -548,14 +548,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -571,14 +571,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -594,14 +594,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -617,14 +617,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -640,14 +640,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -663,14 +663,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -686,14 +686,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -709,14 +709,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -732,14 +732,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -755,14 +755,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -778,14 +778,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -801,14 +801,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -824,14 +824,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -847,14 +847,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -870,14 +870,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
index eea2ac1500..0c812ed3d6 100644
--- a/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/STAThreadTests.Test.Net4_7.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata_With_STA = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -548,14 +548,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -571,14 +571,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -594,14 +594,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -617,14 +617,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -640,14 +640,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -663,14 +663,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -686,14 +686,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -709,14 +709,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -732,14 +732,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -755,14 +755,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -778,14 +778,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -801,14 +801,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -824,14 +824,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -847,14 +847,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
@@ -870,14 +870,14 @@ internal static class TUnit_TestProject_STAThreadTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.STAThreadTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.STAThreadTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
-        Name = "STAThreadTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.STAThreadTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.STAThreadTests)),
+            Name = "STAThreadTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.STAThreadTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.STAThreadTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
index bf21542b70..c90a834e0b 100644
--- a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-        Name = "StringArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.StringArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
+            Name = "StringArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.StringArgumentTests);
         var metadata_Normal__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
@@ -164,14 +164,14 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-        Name = "StringArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.StringArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
+            Name = "StringArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.StringArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
@@ -210,14 +210,14 @@ internal static class TUnit_TestProject_StringArgumentTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.StringArgumentTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.StringArgumentTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
-        Name = "StringArgumentTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.StringArgumentTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.StringArgumentTests)),
+            Name = "StringArgumentTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.StringArgumentTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.StringArgumentTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
index 5bf3d6f026..5968a08a64 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1304",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1304",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
         var metadata_TryParse_InvalidString_ReturnsFailure__string__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
@@ -214,14 +214,14 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1304",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1304",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
@@ -260,14 +260,14 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1304",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1304",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
@@ -299,14 +299,14 @@ internal static class TUnit_TestProject_Bugs__1304_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1304.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1304",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1304.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1304.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1304",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1304.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1304.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
index b2d74da32e..8e9fc0b25a 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1538",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1538",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1538.Tests);
         var metadata_Eight_Args__bool_string__string__string__string__string__string__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
@@ -342,14 +342,14 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1538",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1538",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1538.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
@@ -447,14 +447,14 @@ internal static class TUnit_TestProject_Bugs__1538_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1538.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1538",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1538.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1538.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1538",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1538.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1538.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
index 37f1b85177..a1be5b3ce9 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1539.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__1539_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1539.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1539",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1539",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1539.Tests);
         var metadata_Test = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1539.Tests>(
@@ -75,14 +75,14 @@ internal static class TUnit_TestProject_Bugs__1539_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1539.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1539",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1539.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1539.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1539",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1539.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1539.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
index 0573435a3d..35ab63160d 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1589.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-        Name = "MyTests",
-        Namespace = "TUnit.TestProject.Bugs._1589",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-        {
-        Name = "myFixture",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+            Name = "MyTests",
+            Namespace = "TUnit.TestProject.Bugs._1589",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+                {
+                    Name = "myFixture",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
@@ -86,23 +86,23 @@ internal static class TUnit_TestProject_Bugs__1589_MyTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1589.MyTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
-        Name = "MyTests",
-        Namespace = "TUnit.TestProject.Bugs._1589",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
-        {
-        Name = "myFixture",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1589.MyTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyTests)),
+            Name = "MyTests",
+            Namespace = "TUnit.TestProject.Bugs._1589",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture))
+                {
+                    Name = "myFixture",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1589.MyFixture)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1589.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1589.MyFixture) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1589.MyTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1589.MyTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
index b0617094f7..0efcd97213 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1594.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-        Name = "MyTests",
-        Namespace = "TUnit.TestProject.Bugs._1594",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-        {
-        Name = "myFixture",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+            Name = "MyTests",
+            Namespace = "TUnit.TestProject.Bugs._1594",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+                {
+                    Name = "myFixture",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
         var metadata_Test1 = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
@@ -87,23 +87,23 @@ internal static class TUnit_TestProject_Bugs__1594_MyTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1594.MyTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
-        Name = "MyTests",
-        Namespace = "TUnit.TestProject.Bugs._1594",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
-        {
-        Name = "myFixture",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1594.MyTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyTests)),
+            Name = "MyTests",
+            Namespace = "TUnit.TestProject.Bugs._1594",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture))
+                {
+                    Name = "myFixture",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1594.MyFixture)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1594.MyTests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1594.MyFixture) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1594.MyTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1594.MyTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
index 5ef677c61a..cbc7a416f6 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1603",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1603",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1603.Tests);
         var metadata_Casted_Integer_To_Short_Converts__short = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
@@ -144,14 +144,14 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1603",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1603",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1603.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
@@ -179,14 +179,14 @@ internal static class TUnit_TestProject_Bugs__1603_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1603.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1603",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1603.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1603.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1603",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1603.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1603.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
index e3077492b0..4594a71017 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__1692_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1692.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1692",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1692",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1692.Tests);
         var metadata_NullTest__string_ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1692.Tests>(
@@ -92,14 +92,14 @@ internal static class TUnit_TestProject_Bugs__1692_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1692.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1692",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1692.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1692.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1692",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1692.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1692.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
index a6d9bcb1ce..7311d08618 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1821",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
-        {
-        Name = "data",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1821",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
+                {
+                    Name = "data",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1821.Tests);
         var metadata_MethodDataSource__string = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
@@ -162,23 +162,23 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1821",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
-        {
-        Name = "data",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1821",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
+                {
+                    Name = "data",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1821.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
@@ -210,23 +210,23 @@ internal static class TUnit_TestProject_Bugs__1821_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._1821.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._1821",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
-        {
-        Name = "data",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._1821.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._1821",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(global::TUnit.TestProject.Bugs._1821.MyData))
+                {
+                    Name = "data",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._1821.MyData)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.Bugs._1821.Tests).GetConstructor(new global::System.Type[] { typeof(global::TUnit.TestProject.Bugs._1821.MyData) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._1821.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._1821.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
index 83091dd274..4f2b7f6357 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__2083_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2083.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2083",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2083",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2083.Tests);
         var metadata_MyTest__long = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2083.Tests>(
@@ -97,14 +97,14 @@ internal static class TUnit_TestProject_Bugs__2083_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2083.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2083",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2083.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2083.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2083",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2083.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2083.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
index 7355bc33e2..d1ad71eaea 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2085",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2085",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2085.Tests);
         var metadata_Double_SpecialConsts__double = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
@@ -144,14 +144,14 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2085",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2085",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2085.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
@@ -179,14 +179,14 @@ internal static class TUnit_TestProject_Bugs__2085_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2085.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2085",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2085.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2085.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2085",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2085.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2085.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
index 6b50b0eea1..4995c53e1a 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2112",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2112",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2112.Tests);
         var metadata_Test__int_long__ = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
@@ -222,14 +222,14 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2112",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2112",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2112.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
@@ -265,14 +265,14 @@ internal static class TUnit_TestProject_Bugs__2112_Tests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._2112.Tests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
-        Name = "Tests",
-        Namespace = "TUnit.TestProject.Bugs._2112",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.Bugs._2112.Tests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._2112.Tests)),
+            Name = "Tests",
+            Namespace = "TUnit.TestProject.Bugs._2112",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.Bugs._2112.Tests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.Bugs._2112.Tests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
index 0f7ad88fa0..9d3ce44afc 100644
--- a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
@@ -11,23 +11,23 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-        Name = "TimeoutCancellationTokenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+            Name = "TimeoutCancellationTokenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata_DefaultTest__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -583,23 +583,23 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-        Name = "TimeoutCancellationTokenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+            Name = "TimeoutCancellationTokenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -648,23 +648,23 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-        Name = "TimeoutCancellationTokenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+            Name = "TimeoutCancellationTokenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -713,23 +713,23 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-        Name = "TimeoutCancellationTokenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+            Name = "TimeoutCancellationTokenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -778,23 +778,23 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-        Name = "TimeoutCancellationTokenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+            Name = "TimeoutCancellationTokenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -854,23 +854,23 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-        Name = "TimeoutCancellationTokenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+            Name = "TimeoutCancellationTokenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -951,23 +951,23 @@ internal static class TUnit_TestProject_TimeoutCancellationTokenTests__TestSourc
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutCancellationTokenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
-        Name = "TimeoutCancellationTokenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests)),
+            Name = "TimeoutCancellationTokenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TimeoutCancellationTokenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutCancellationTokenTests>(
@@ -1050,23 +1050,23 @@ internal static class TUnit_TestProject_TimeoutDoesNotFireTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutDoesNotFireTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
-        Name = "TimeoutDoesNotFireTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
+            Name = "TimeoutDoesNotFireTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests);
         var metadata_QuickTestDoesNotTimeout__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutDoesNotFireTests>(
@@ -1155,23 +1155,23 @@ internal static class TUnit_TestProject_TimeoutDoesNotFireTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TimeoutDoesNotFireTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
-        Name = "TimeoutDoesNotFireTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests)),
+            Name = "TimeoutDoesNotFireTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TimeoutDoesNotFireTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TimeoutDoesNotFireTests>(
@@ -1243,23 +1243,23 @@ internal static class TUnit_TestProject_CancellationTokenTriggeredTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CancellationTokenTriggeredTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
-        Name = "CancellationTokenTriggeredTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
+            Name = "CancellationTokenTriggeredTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests);
         var metadata_CancellationTokenIsTriggered__CancellationToken = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CancellationTokenTriggeredTests>(
@@ -1348,23 +1348,23 @@ internal static class TUnit_TestProject_CancellationTokenTriggeredTests__TestSou
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.CancellationTokenTriggeredTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
-        Name = "CancellationTokenTriggeredTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = new global::TUnit.Core.ParameterMetadata[]
-        {
-        new global::TUnit.Core.ParameterMetadata(typeof(int))
-        {
-        Name = "value",
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
-        IsNullable = false,
-        ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
-        }
-        },
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests)),
+            Name = "CancellationTokenTriggeredTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = new global::TUnit.Core.ParameterMetadata[]
+            {
+                new global::TUnit.Core.ParameterMetadata(typeof(int))
+                {
+                    Name = "value",
+                    TypeInfo = new global::TUnit.Core.ConcreteType(typeof(int)),
+                    IsNullable = false,
+                    ReflectionInfo = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests).GetConstructor(new global::System.Type[] { typeof(int) })!.GetParameters()[0]
+                }
+            },
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.CancellationTokenTriggeredTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.CancellationTokenTriggeredTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
index d52363f53a..d72f6ffac0 100644
--- a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata_DataSource_TupleMethod__int_string_bool = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
@@ -117,14 +117,14 @@ internal static class TUnit_TestProject_TupleDataSourceDrivenTests__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.TupleDataSourceDrivenTests", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
-        Name = "TupleDataSourceDrivenTests",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests)),
+            Name = "TupleDataSourceDrivenTests",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TupleDataSourceDrivenTests);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TupleDataSourceDrivenTests>(
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
index b423ea3c17..caaf3637f3 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_AotDataSourceTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.AotDataSourceTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
-        Name = "AotDataSourceTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
+            Name = "AotDataSourceTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AotDataSourceTest);
         var metadata_TestWithDataSource__int_int_int = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AotDataSourceTest>(
@@ -106,14 +106,14 @@ internal static class TUnit_TestProject_AotDataSourceTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.AotDataSourceTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
-        Name = "AotDataSourceTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.AotDataSourceTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AotDataSourceTest)),
+            Name = "AotDataSourceTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.AotDataSourceTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.AotDataSourceTest>(
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
index 1698843ec5..6581487753 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ConfigurationSupport.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_ConfigurationTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ConfigurationTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConfigurationTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
-        Name = "ConfigurationTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConfigurationTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
+            Name = "ConfigurationTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConfigurationTest);
         var metadata_TestWithConfiguration = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConfigurationTest>(
@@ -70,14 +70,14 @@ internal static class TUnit_TestProject_ConfigurationTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ConfigurationTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ConfigurationTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
-        Name = "ConfigurationTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ConfigurationTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ConfigurationTest)),
+            Name = "ConfigurationTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ConfigurationTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ConfigurationTest>(
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
index ec38be63a1..9c4b412707 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_ModuleInitializer_Generation.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_ModuleInitializerTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ModuleInitializerTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
-        Name = "ModuleInitializerTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
+            Name = "ModuleInitializerTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ModuleInitializerTest);
         var metadata_TestWithModuleInit = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ModuleInitializerTest>(
@@ -70,14 +70,14 @@ internal static class TUnit_TestProject_ModuleInitializerTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.ModuleInitializerTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
-        Name = "ModuleInitializerTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.ModuleInitializerTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ModuleInitializerTest)),
+            Name = "ModuleInitializerTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.ModuleInitializerTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.ModuleInitializerTest>(
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
index a409f64a3a..1c8142fbb8 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_StronglyTypedDelegates_Generation.verified.txt
@@ -11,14 +11,14 @@ internal static class TUnit_TestProject_TypedDelegateTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.TypedDelegateTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
-        Name = "TypedDelegateTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
+            Name = "TypedDelegateTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TypedDelegateTest);
         var metadata_TestWithDelegate = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TypedDelegateTest>(
@@ -70,14 +70,14 @@ internal static class TUnit_TestProject_TypedDelegateTest__TestSource
     {
         var __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("UnifiedReflectionFreeTests:global::TUnit.TestProject.TypedDelegateTest", new global::TUnit.Core.ClassMetadata
         {
-        Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
-        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
-        Name = "TypedDelegateTest",
-        Namespace = "TUnit.TestProject",
-        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
-        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
-        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
-        Parent = null
+            Type = typeof(global::TUnit.TestProject.TypedDelegateTest),
+            TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.TypedDelegateTest)),
+            Name = "TypedDelegateTest",
+            Namespace = "TUnit.TestProject",
+            Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("UnifiedReflectionFreeTests", "UnifiedReflectionFreeTests"),
+            Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+            Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+            Parent = null
         });
         var __classType = typeof(global::TUnit.TestProject.TypedDelegateTest);
         var metadata = global::TUnit.Core.TestMetadataFactory.Create<global::TUnit.TestProject.TypedDelegateTest>(
diff --git a/TUnit.Core.SourceGenerator/Utilities/MetadataGenerationHelper.cs b/TUnit.Core.SourceGenerator/Utilities/MetadataGenerationHelper.cs
index fd6cbe5b0d..506524ef65 100644
--- a/TUnit.Core.SourceGenerator/Utilities/MetadataGenerationHelper.cs
+++ b/TUnit.Core.SourceGenerator/Utilities/MetadataGenerationHelper.cs
@@ -125,7 +125,7 @@ private static void WriteClassMetadataGetOrAdd(ICodeWriter writer, INamedTypeSym
     /// </summary>
     public static string GenerateClassMetadataGetOrAddWithParentExpression(INamedTypeSymbol typeSymbol, int indentLevel = 0)
     {
-        var writer = new CodeWriter("", includeHeader: false).SetIndentLevel(indentLevel);
+        var writer = new CodeWriter(includeHeader: false).SetIndentLevel(indentLevel);
         WriteClassMetadataGetOrAddWithParent(writer, typeSymbol);
         return writer.ToString();
     }

From 33edc6d8fc7b13d731b36ce12e8fdfec8cf1aafe Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Mon, 2 Mar 2026 14:15:59 +0000
Subject: [PATCH 6/7] fix: update public API snapshots for required
 testSessionId parameter

---
 ...ts.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt | 4 ++--
 ...sts.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt | 4 ++--
 ...sts.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt | 4 ++--
 .../Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt
index 4fa0539b0c..e93c94818d 100644
--- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt
+++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt
@@ -1551,6 +1551,7 @@ namespace
                     <[]> attributeFactory,
                     <[], object?[], T> instanceFactory,
                     .MethodMetadata methodMetadata,
+                    string testSessionId,
                     string filePath = "",
                     int inheritanceDepth = 0,
                     .TestDependency[]? dependencies = null,
@@ -1558,8 +1559,7 @@ namespace
                     .IDataSourceAttribute[]? classDataSources = null,
                     .PropertyDataSource[]? propertyDataSources = null,
                     .PropertyInjectionData[]? propertyInjections = null,
-                    int? repeatCount = default,
-                    string? testSessionId = null)
+                    int? repeatCount = default)
             where T :  class { }
     }
     public class TestMetadata<[.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  T> : .TestMetadata, .
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt
index e3ba1bf26d..903278b531 100644
--- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt
+++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt
@@ -1551,6 +1551,7 @@ namespace
                     <[]> attributeFactory,
                     <[], object?[], T> instanceFactory,
                     .MethodMetadata methodMetadata,
+                    string testSessionId,
                     string filePath = "",
                     int inheritanceDepth = 0,
                     .TestDependency[]? dependencies = null,
@@ -1558,8 +1559,7 @@ namespace
                     .IDataSourceAttribute[]? classDataSources = null,
                     .PropertyDataSource[]? propertyDataSources = null,
                     .PropertyInjectionData[]? propertyInjections = null,
-                    int? repeatCount = default,
-                    string? testSessionId = null)
+                    int? repeatCount = default)
             where T :  class { }
     }
     public class TestMetadata<[.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  T> : .TestMetadata, .
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt
index 7d49c8e62d..860cc2f6ea 100644
--- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt
+++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt
@@ -1551,6 +1551,7 @@ namespace
                     <[]> attributeFactory,
                     <[], object?[], T> instanceFactory,
                     .MethodMetadata methodMetadata,
+                    string testSessionId,
                     string filePath = "",
                     int inheritanceDepth = 0,
                     .TestDependency[]? dependencies = null,
@@ -1558,8 +1559,7 @@ namespace
                     .IDataSourceAttribute[]? classDataSources = null,
                     .PropertyDataSource[]? propertyDataSources = null,
                     .PropertyInjectionData[]? propertyInjections = null,
-                    int? repeatCount = default,
-                    string? testSessionId = null)
+                    int? repeatCount = default)
             where T :  class { }
     }
     public class TestMetadata<[.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  T> : .TestMetadata, .
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt
index 81056f9881..42af20a736 100644
--- a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt
+++ b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt
@@ -1500,6 +1500,7 @@ namespace
                     <[]> attributeFactory,
                     <[], object?[], T> instanceFactory,
                     .MethodMetadata methodMetadata,
+                    string testSessionId,
                     string filePath = "",
                     int inheritanceDepth = 0,
                     .TestDependency[]? dependencies = null,
@@ -1507,8 +1508,7 @@ namespace
                     .IDataSourceAttribute[]? classDataSources = null,
                     .PropertyDataSource[]? propertyDataSources = null,
                     .PropertyInjectionData[]? propertyInjections = null,
-                    int? repeatCount = default,
-                    string? testSessionId = null)
+                    int? repeatCount = default)
             where T :  class { }
     }
     public class TestMetadata<T> : .TestMetadata, .

From 260f6a11aa96d90a46bca0f4202f904b5f5ba80d Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Mon, 2 Mar 2026 15:04:22 +0000
Subject: [PATCH 7/7] refactor: inline redundant
 PreGeneratePropertyInjectionsExpression wrapper

---
 .../Generators/TestMetadataGenerator.cs                | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
index c43094991f..1a5c0b939e 100644
--- a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
+++ b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
@@ -2682,7 +2682,7 @@ private static void AppendOptionalFactoryParameters(CodeWriter writer, TestMetho
         }
 
         // Property injections
-        var propInj = PreGeneratePropertyInjectionsExpression(testMethod.TypeSymbol, className);
+        var propInj = GeneratePropertyInjectionsExpression(testMethod.TypeSymbol, className);
         if (propInj != null)
         {
             writer.AppendLine(",");
@@ -2845,14 +2845,6 @@ private static void AppendOptionalFactoryParameters(CodeWriter writer, TestMetho
         return writer.ToString();
     }
 
-    /// <summary>
-    /// Returns a PropertyInjectionData[] expression, or null if empty.
-    /// </summary>
-    private static string? PreGeneratePropertyInjectionsExpression(INamedTypeSymbol typeSymbol, string className)
-    {
-        return GeneratePropertyInjectionsExpression(typeSymbol, className);
-    }
-
     /// <summary>
     /// Pre-generates UnsafeAccessor declarations for init-only properties.
     /// Returns empty string if none needed.